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

fix(ansibleserver): don't init privateKey for ansibleplaybook if it already have one

Browse Source
This commit is contained in:
rainzm
2021-04-26 18:59:44 +08:00
parent ef9a9b2935
commit 9502cfebf4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/ansibleserver/models/ansibleplaybooks.go
+6 -4
View File
@@ -186,10 +186,12 @@ func (apb *SAnsiblePlaybook) runPlaybook(ctx context.Context, userCred mcclient.
// init private key
pb := apb.Playbook.Copy()
if k, err := mcclient_modules.Sshkeypairs.FetchPrivateKey(ctx, userCred); err != nil {
return err
} else {
pb.PrivateKey = []byte(k)
if len(pb.PrivateKey) == 0 {
if k, err := mcclient_modules.Sshkeypairs.FetchPrivateKey(ctx, userCred); err != nil {
return err
} else {
pb.PrivateKey = []byte(k)
}
}
pb.OutputWriter(&ansiblePlaybookOutputWriter{apb})