test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

change ansible host state judgment

Browse Source
This commit is contained in:
barnett 2019-08-10 20:56:06 +08:00
parent 693eade0af
commit d4b4b6d711
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/ansible/ansible.go
View File

@ -192,8 +192,11 @@ func (c *HostConfig) AddHost(h *client.HostNode, installConfPath string) {
AnsibleSSHPrivateKeyFile: h.KeyPath,
}
c.GroupList["all"].AddHost(ansibleHost)
checkNeedInstall := func(h *client.HostNode) bool {
return h.Status == client.NotInstalled || h.Status == client.InstallFailed || h.Status == client.Installing
}
if h.Role.HasRule("manage") {
if h.Status == client.NotInstalled || h.Status == client.InstallFailed {
if checkNeedInstall(h) {
c.GroupList["new-manage"].AddHost(ansibleHost)
} else {
c.GroupList["manage"].AddHost(ansibleHost)
@ -203,14 +206,14 @@ func (c *HostConfig) AddHost(h *client.HostNode, installConfPath string) {
}
}
if h.Role.HasRule("compute") {
if h.Status == client.NotInstalled || h.Status == client.InstallFailed {
if checkNeedInstall(h) {
c.GroupList["new-compute"].AddHost(ansibleHost)
} else {
c.GroupList["compute"].AddHost(ansibleHost)
}
}
if h.Role.HasRule("gateway") {
if h.Status == client.NotInstalled || h.Status == client.InstallFailed {
if checkNeedInstall(h) {
c.GroupList["new-gateway"].AddHost(ansibleHost)
} else {
c.GroupList["gateway"].AddHost(ansibleHost)