provisioners/ansible_local: Change binary detection
- Remove `ansible-galaxy` detection, since this command was introduced in Ansible 1.4.2 (December 2013). Checking for `ansible-playbook` presence should therefore be enough for any "modern" Ansible setup. - Look for the command defined by the new `playbook_command` option. Related to GH-7881 and GH-7536
This commit is contained in:
parent
b1ddc98e17
commit
a55590b84f
|
@ -52,9 +52,9 @@ module VagrantPlugins
|
||||||
@machine.guest.capability(:ansible_install, config.install_mode, config.version)
|
@machine.guest.capability(:ansible_install, config.install_mode, config.version)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Check that ansible binaries are well installed on the guest,
|
# Check that Ansible Playbook command is available on the guest
|
||||||
@machine.communicate.execute(
|
@machine.communicate.execute(
|
||||||
'test -x "$(command -v ansible-galaxy)" && test -x "$(command -v ansible-playbook)"',
|
"test -x \"$(command -v #{config.playbook_command})\"",
|
||||||
error_class: Ansible::Errors::AnsibleNotFoundOnGuest,
|
error_class: Ansible::Errors::AnsibleNotFoundOnGuest,
|
||||||
error_key: :ansible_not_found_on_guest
|
error_key: :ansible_not_found_on_guest
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue