haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add ansible.host_key_checking configuration parameter

This commit is contained in:
Matthew Johnson 2013-09-13 22:48:12 -04:00
parent 7b440339f3
commit 131ce4fc97
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/provisioners/ansible/config.rb
View File

@ -12,38 +12,41 @@ module VagrantPlugins
attr_accessor :tags attr_accessor :tags
attr_accessor :skip_tags attr_accessor :skip_tags
attr_accessor :start_at_task attr_accessor :start_at_task
attr_accessor :host_key_checking
# Joker attribute, used to pass unsupported arguments to ansible anyway # Joker attribute, used to pass unsupported arguments to ansible anyway
attr_accessor :raw_arguments attr_accessor :raw_arguments
def initialize def initialize
@playbook = UNSET_VALUE @playbook = UNSET_VALUE
@extra_vars = UNSET_VALUE @extra_vars = UNSET_VALUE
@inventory_path = UNSET_VALUE @inventory_path = UNSET_VALUE
@ask_sudo_pass = UNSET_VALUE @ask_sudo_pass = UNSET_VALUE
@limit = UNSET_VALUE @limit = UNSET_VALUE
@sudo = UNSET_VALUE @sudo = UNSET_VALUE
@sudo_user = UNSET_VALUE @sudo_user = UNSET_VALUE
@verbose = UNSET_VALUE @verbose = UNSET_VALUE
@tags = UNSET_VALUE @tags = UNSET_VALUE
@skip_tags = UNSET_VALUE @skip_tags = UNSET_VALUE
@start_at_task = UNSET_VALUE @start_at_task = UNSET_VALUE
@raw_arguments = UNSET_VALUE @raw_arguments = UNSET_VALUE
@host_key_checking = "true"
end end
def finalize! def finalize!
@playbook = nil if @playbook == UNSET_VALUE @playbook = nil if @playbook == UNSET_VALUE
@extra_vars = nil if @extra_vars == UNSET_VALUE @extra_vars = nil if @extra_vars == UNSET_VALUE
@inventory_path = nil if @inventory_path == UNSET_VALUE @inventory_path = nil if @inventory_path == UNSET_VALUE
@ask_sudo_pass = nil if @ask_sudo_pass == UNSET_VALUE @ask_sudo_pass = nil if @ask_sudo_pass == UNSET_VALUE
@limit = nil if @limit == UNSET_VALUE @limit = nil if @limit == UNSET_VALUE
@sudo = nil if @sudo == UNSET_VALUE @sudo = nil if @sudo == UNSET_VALUE
@sudo_user = nil if @sudo_user == UNSET_VALUE @sudo_user = nil if @sudo_user == UNSET_VALUE
@verbose = nil if @verbose == UNSET_VALUE @verbose = nil if @verbose == UNSET_VALUE
@tags = nil if @tags == UNSET_VALUE @tags = nil if @tags == UNSET_VALUE
@skip_tags = nil if @skip_tags == UNSET_VALUE @skip_tags = nil if @skip_tags == UNSET_VALUE
@start_at_task = nil if @start_at_task == UNSET_VALUE @start_at_task = nil if @start_at_task == UNSET_VALUE
@raw_arguments = nil if @raw_arguments == UNSET_VALUE @raw_arguments = nil if @raw_arguments == UNSET_VALUE
@host_key_checking = nil if @host_key_checking == UNSET_VALUE
end end
def validate(machine) def validate(machine)

2
plugins/provisioners/ansible/provisioner.rb
View File

@ -38,7 +38,7 @@ module VagrantPlugins
# Write stdout and stderr data, since it's the regular Ansible output # Write stdout and stderr data, since it's the regular Ansible output
command << { command << {
:env => { "ANSIBLE_FORCE_COLOR" => "true" }, :env => { "ANSIBLE_FORCE_COLOR" => "true" , "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}" },
:notify => [:stdout, :stderr], :notify => [:stdout, :stderr],
:workdir => @machine.env.root_path.to_s :workdir => @machine.env.root_path.to_s
} }

1
website/docs/source/v2/provisioning/ansible.html.md
View File

@ -141,3 +141,4 @@ by the sudo command.
* `ansible.raw_arguments` is an *unsafe wildcard* string that can be used to take advantage of `ansible-playbook` arguments that are not (yet) supported by this Vagrant provisioner plugin. This can be very useful when integrating with bleeding edge Ansible versions. Following precedence rules apply: * `ansible.raw_arguments` is an *unsafe wildcard* string that can be used to take advantage of `ansible-playbook` arguments that are not (yet) supported by this Vagrant provisioner plugin. This can be very useful when integrating with bleeding edge Ansible versions. Following precedence rules apply:
* Any supported options (described above) will override conflicting `raw_arguments` value (e.g. `--tags` or `--start-at-task`) * Any supported options (described above) will override conflicting `raw_arguments` value (e.g. `--tags` or `--start-at-task`)
* Vagrant default user authentication can be overridden via `raw_arguments` (with custom values for `--user` and `--private-key`) * Vagrant default user authentication can be overridden via `raw_arguments` (with custom values for `--user` and `--private-key`)
* `ansible.host_key_checking` can be set to `false` which will disable host key checking and prevent `"FAILED: (25, 'Inappropriate ioctl for device')"` errors from being reported during provisioner runs. The default value is `true`, which matches the default behavior of Ansible 1.2.1 and later.