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

Added AnsibleSSHExtraArgs

This commit is contained in:
Larry 2020-08-25 08:53:41 -05:00 committed by GitHub
parent fbfe31ceaf
commit 7cb17f64a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
provisioner/ansible/provisioner.go
View File

@ -89,6 +89,8 @@ type Config struct {
AnsibleEnvVars []string `mapstructure:"ansible_env_vars"` AnsibleEnvVars []string `mapstructure:"ansible_env_vars"`
// The playbook to be run by Ansible. // The playbook to be run by Ansible.
PlaybookFile string `mapstructure:"playbook_file" required:"true"` PlaybookFile string `mapstructure:"playbook_file" required:"true"`
// Specifies --ssh-extra-args on command line defaults to -o IdentitiesOnly=yes
AnsibleSSHExtraArgs []string `mapstructure:"ansible_ssh_extra_args"`
// The groups into which the Ansible host should // The groups into which the Ansible host should
// be placed. When unspecified, the host is not associated with any groups. // be placed. When unspecified, the host is not associated with any groups.
Groups []string `mapstructure:"groups"` Groups []string `mapstructure:"groups"`
@ -701,8 +703,16 @@ func (p *Provisioner) createCmdArgs(httpAddr, inventory, playbook, privKeyFile s
if p.generatedData["ConnType"] == "ssh" && len(privKeyFile) > 0 { if p.generatedData["ConnType"] == "ssh" && len(privKeyFile) > 0 {
// Add ssh extra args to set IdentitiesOnly // Add ssh extra args to set IdentitiesOnly
if len(p.config.AnsibleSSHExtraArgs) > 0 {
var sshExtraArgs string
for _, sshExtraArg := range p.config.AnsibleSSHExtraArgs {
sshExtraArgs = sshExtraArgs + sshExtraArg
}
args = append(args, "--ssh-extra-args", fmt.Sprintf("'%s'", sshExtraArgs))
} else {
args = append(args, "--ssh-extra-args", "'-o IdentitiesOnly=yes'") args = append(args, "--ssh-extra-args", "'-o IdentitiesOnly=yes'")
} }
}
args = append(args, p.config.ExtraArguments...) args = append(args, p.config.ExtraArguments...)