From 083522e169bbb12b4745ffcd6b2a5b3162f4a1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= Date: Tue, 11 Jul 2023 10:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/task_manage.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 40c0e42..25749e3 100644 --- a/src/service/task_manage.go +++ b/src/service/task_manage.go @@ -227,24 +227,26 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq, script string) (id for _, v := range hostManageList { hostsIp := "" if v.VoucherType == 0 { - hostsIp = fmt.Sprintf("%s:%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\" ansible_host_key_checking=false\n", + hostsIp = fmt.Sprintf("%s:%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\" ansible_host_key_checking=false", v.Ip, v.Port, v.UserName, v.Password) } else { - hostsIp = fmt.Sprintf("%s:%s ansible_ssh_user=\"%s\" ansible_ssh_private_key_file=/root/.ssh/id_rsa ansible_host_key_checking=false\n", + hostsIp = fmt.Sprintf("%s:%s ansible_ssh_user=\"%s\" ansible_ssh_private_key_file=/root/.ssh/id_rsa ansible_host_key_checking=false", v.Ip, v.Port, v.UserName) } hosts = append(hosts, hostsIp) } //写入主机信息 - hostsIp := strings.Replace(strings.Trim(fmt.Sprint(hosts), "[]"), " ", "\n", -1) + + //hostsIp := strings.Replace(strings.Trim(fmt.Sprint(hosts), "[]"), " ", " ", -1) hostsGroup, err := os.Create("/etc/ansible/hosts_" + fmt.Sprintf("%d", req.TaskId)) if err != nil { err = resp.FileExecError.WithError(err) return } defer hostsGroup.Close() - _, err = hostsGroup.Write([]byte(hostsIp)) + //_, err = hostsGroup.Write([]byte(hostsIp)) + _, err = hostsGroup.Write([]byte(strings.Join(hosts, "\n"))) if err != nil { err = resp.FileExecError.WithError(err) return -- 2.26.0