Commit f6bd70dc authored by 陈子龙's avatar 陈子龙

Merge branch 'dev-czl' into dev

parents d9b3e447 03a71f3a
...@@ -352,22 +352,22 @@ func (h *HostManageSvc) ListStateHostManage(req request.StateHostManageReq) (err ...@@ -352,22 +352,22 @@ func (h *HostManageSvc) ListStateHostManage(req request.StateHostManageReq) (err
} }
//往hosts文件中写入主机组ip //往hosts文件中写入主机组ip
f, err := os.OpenFile("/etc/ansible/hosts", os.O_APPEND|os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0777) //f, err := os.OpenFile("/etc/ansible/hosts", os.O_APPEND|os.O_CREATE|os.O_RDWR, 0777)
if err != nil { //if err != nil {
err = resp.FileExecError.WithError(err) // err = resp.FileExecError.WithError(err)
return // return
} //}
defer f.Close() //defer f.Close()
_, err = f.Write([]byte(fmt.Sprintf("%s%d\n", AnsibleGroup, req.Id))) //_, err = f.Write([]byte(fmt.Sprintf("%s%d\n", AnsibleGroup, req.Id)))
if err != nil { //if err != nil {
return resp.FileExecError.WithError(err) // return resp.FileExecError.WithError(err)
} //}
for _, v := range hostManageList { //for _, v := range hostManageList {
_, err = f.Write([]byte(fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\"\n", v.Ip, v.Ip, v.Port, v.UserName, v.Password))) // _, err = f.Write([]byte(fmt.Sprintf("%s ansible_ssh_host=%s ansible_ssh_port=%s ansible_ssh_user=\"%s\" ansible_ssh_pass=\"%s\"\n", v.Ip, v.Ip, v.Port, v.UserName, v.Password)))
if err != nil { // if err != nil {
return resp.FileExecError.WithError(err) // return resp.FileExecError.WithError(err)
} // }
} //}
for _, v := range hostManageList { for _, v := range hostManageList {
//修改状态 //修改状态
_, err = session.Table("host_manage_list").Where("is_delete = 0 AND id = ?", v.Id). _, err = session.Table("host_manage_list").Where("is_delete = 0 AND id = ?", v.Id).
...@@ -416,7 +416,7 @@ func (h *HostManageSvc) SaveStateHostManage(hostManageList []request.HostManageL ...@@ -416,7 +416,7 @@ func (h *HostManageSvc) SaveStateHostManage(hostManageList []request.HostManageL
} }
//往hosts文件中写入主机组ip //往hosts文件中写入主机组ip
f, err := os.OpenFile("/etc/ansible/hosts", os.O_APPEND|os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0777) f, err := os.Open("/etc/ansible/hosts")
if err != nil { if err != nil {
err = resp.FileExecError.WithError(err) err = resp.FileExecError.WithError(err)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment