From 9502cfebf431e62c75be108d39a0011129223a1d Mon Sep 17 00:00:00 2001 From: rainzm Date: Mon, 26 Apr 2021 18:53:07 +0800 Subject: [PATCH] fix(ansibleserver): don't init privateKey for ansibleplaybook if it already have one --- pkg/ansibleserver/models/ansibleplaybooks.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/ansibleserver/models/ansibleplaybooks.go b/pkg/ansibleserver/models/ansibleplaybooks.go index 0ef0f61b8c..dfbdcfcd47 100644 --- a/pkg/ansibleserver/models/ansibleplaybooks.go +++ b/pkg/ansibleserver/models/ansibleplaybooks.go @@ -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})