github/wp-ansible
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-ansible.git synced 2024-11-25 09:00:39 +00:00
Code Issues Releases Activity

Process vault flags prior to syntax check flag

Browse Source
This commit is contained in:
Will Hegedus 2020-04-08 14:26:07 -04:00
parent 91e0749965
commit 5d47351d10
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugin.go
View File

@ -245,8 +245,8 @@ func (p *Plugin) ansibleCommand(inventory string) *exec.Cmd {
inventory, inventory,
} }
if p.Config.SyntaxCheck { if p.Config.ListHosts {
args = append(args, "--syntax-check") args = append(args, "--list-hosts")
args = append(args, p.Config.Playbooks...) args = append(args, p.Config.Playbooks...)
return exec.Command( return exec.Command(
@ -255,8 +255,16 @@ func (p *Plugin) ansibleCommand(inventory string) *exec.Cmd {
) )
} }
if p.Config.ListHosts { if p.Config.VaultID != "" {
args = append(args, "--list-hosts") args = append(args, "--vault-id", p.Config.VaultID)
}
if p.Config.VaultPasswordFile != "" {
args = append(args, "--vault-password-file", p.Config.VaultPasswordFile)
}
if p.Config.SyntaxCheck {
args = append(args, "--syntax-check")
args = append(args, p.Config.Playbooks...) args = append(args, p.Config.Playbooks...)
return exec.Command( return exec.Command(
@ -317,14 +325,6 @@ func (p *Plugin) ansibleCommand(inventory string) *exec.Cmd {
args = append(args, "--tags", p.Config.Tags) args = append(args, "--tags", p.Config.Tags)
} }
if p.Config.VaultID != "" {
args = append(args, "--vault-id", p.Config.VaultID)
}
if p.Config.VaultPasswordFile != "" {
args = append(args, "--vault-password-file", p.Config.VaultPasswordFile)
}
if p.Config.PrivateKeyFile != "" { if p.Config.PrivateKeyFile != "" {
args = append(args, "--private-key", p.Config.PrivateKeyFile) args = append(args, "--private-key", p.Config.PrivateKeyFile)
} }