diff --git a/src/service/task_manage.go b/src/service/task_manage.go index 40c0e422f6b5d01e92f0a62a01b90e8767f91a55..25749e3a0b2f13f9763df3e686c908c88b5abbb5 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