iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix default ssh-extra-args flag

This commit is contained in:
Megan Marsh 2020-03-31 13:13:01 -07:00
parent d57809bcda
commit d45ffe73d0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
provisioner/ansible/provisioner.go
View File

@ -565,7 +565,7 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, pri
} }
} }
args := []string{"-e", fmt.Sprintf("packer_build_name=%s", p.config.PackerBuildName), "-e", fmt.Sprintf("packer_builder_type=%s", p.config.PackerBuilderType), "-e", "IdentitiesOnly=yes"} args := []string{"-e", fmt.Sprintf("packer_build_name=%s", p.config.PackerBuildName), "-e", fmt.Sprintf("packer_builder_type=%s", p.config.PackerBuilderType)}
if len(privKeyFile) > 0 { if len(privKeyFile) > 0 {
// Changed this from using --private-key to supplying -e ansible_ssh_private_key_file as the latter // Changed this from using --private-key to supplying -e ansible_ssh_private_key_file as the latter
// is treated as a highest priority variable, and thus prevents overriding by dynamic variables // is treated as a highest priority variable, and thus prevents overriding by dynamic variables
@ -585,6 +585,11 @@ func (p *Provisioner) executeAnsible(ui packer.Ui, comm packer.Communicator, pri
args = append(args, "-e", fmt.Sprintf(" ansible_password=%s", p.generatedData["Password"])) args = append(args, "-e", fmt.Sprintf(" ansible_password=%s", p.generatedData["Password"]))
} }
if p.generatedData["ConnType"] == "ssh" {
// Add ssh extra args to set IdentitiesOnly
args = append(args, "--ssh-extra-args", "-o IdentitiesOnly=yes")
}
args = append(args, "-i", inventory, playbook) args = append(args, "-i", inventory, playbook)
args = append(args, p.config.ExtraArguments...) args = append(args, p.config.ExtraArguments...)