opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11028 from rainzm/automated-cherry-pick-of-#11027-upstream-release-3.7

Browse Source 
Automated cherry pick of #11027: fix for install agent for vm
This commit is contained in:
yunion-ci-robot
2021-05-11 09:52:55 +08:00
committed by GitHub
parent c1cf476f6f b5d4b30ddf
commit 4fc53ac5af
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudproxy/models/forwards.go
+16
View File
@@ -485,3 +485,19 @@ func (fwd *SForward) PerformHeartbeat(ctx context.Context, userCred mcclient.Tok
}
return nil, nil
}
func (fwd *SForward) AllowGetDetailsLastseen(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool {
return fwd.IsOwner(userCred) || db.IsAllowGetSpec(rbacutils.ScopeSystem, userCred, fwd, "last_seen")
}
func (fwd *SForward) GetDetailsLastseen(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
ret := jsonutils.NewDict()
var lastSeen string
if fwd.LastSeen.IsZero() {
lastSeen = ""
} else {
lastSeen = fwd.LastSeen.Format("2006-01-02T15:04:05.000000Z")
}
ret.Add(jsonutils.NewString(lastSeen), "last_seen")
return ret, nil
}
pkg/devtool/tasks/apply_script_task.go
+3 -1
View File
@@ -213,7 +213,9 @@ func (self *ApplyScriptTask) OnInit(ctx context.Context, obj db.IStandaloneModel
self.SetStage("OnAnsiblePlaybookComplete", updateData)
// Inject Task Header
session.Header = self.GetTaskRequestHeader()
taskHeader := self.GetTaskRequestHeader()
session.Header.Set(mcclient.TASK_NOTIFY_URL, taskHeader.Get(mcclient.TASK_NOTIFY_URL))
session.Header.Set(mcclient.TASK_ID, taskHeader.Get(mcclient.TASK_ID))
_, err = modules.AnsiblePlaybookReference.PerformAction(session, s.PlaybookReferenceId, "run", params)
if err != nil {
self.clearLocalForward(session, forwardId)
pkg/devtool/utils/influxdb_url.go
+1 -1
View File
@@ -182,7 +182,7 @@ func convertInfluxdbUrl(ctx context.Context, pUrl string, endpointId string) (po
time.Sleep(waitTime)
times += 1
waitTime += time.Second * time.Duration(times)
data, err = cloudproxy.Forwards.GetSpecific(session, forwardId, "last_seen", nil)
data, err = cloudproxy.Forwards.GetSpecific(session, forwardId, "lastseen", nil)
if err != nil {
err = errors.Wrapf(err, "unable to check last_seen for forward %s", forwardId)
return