Commit 9cc03d88 authored by 黄智's avatar 黄智

Merge remote-tracking branch 'origin/dev' into dev

parents db3fc9c6 6ece8975
...@@ -202,9 +202,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{}, ...@@ -202,9 +202,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (data interface{},
if err != nil { if err != nil {
return nil, resp.MarshalError.WithError(errors.New("yaml格式错误")) return nil, resp.MarshalError.WithError(errors.New("yaml格式错误"))
} }
if script["host"] == "all" {
script["host"] = fmt.Sprintf("%s%d", AnsibleGroup, req.HostGroupId) script["host"] = fmt.Sprintf("%s%d", AnsibleGroup, req.HostGroupId)
}
j, err := json.Marshal(script) j, err := json.Marshal(script)
if err != nil { if err != nil {
return nil, resp.MarshalError.WithError(err) return nil, resp.MarshalError.WithError(err)
......
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