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

provisioners/ansible_local: remove repetitions

This commit is contained in:
Gilles Cornu 2015-11-20 00:11:44 +01:00
parent 74eb3109cf
commit c9fe02cea5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/provisioners/ansible/provisioner/guest.rb
View File

@ -71,10 +71,7 @@ module VagrantPlugins
} }
remote_command = config.galaxy_command % command_values remote_command = config.galaxy_command % command_values
ui_running_ansible_command "galaxy", remote_command execute_ansible_command_on_guest "galaxy", remote_command
result = execute_on_guest(remote_command)
raise Ansible::Errors::AnsibleCommandFailed if result != 0
end end
def execute_ansible_playbook_on_guest def execute_ansible_playbook_on_guest
@ -84,9 +81,13 @@ module VagrantPlugins
command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}" remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}"
ui_running_ansible_command "playbook", remote_command execute_ansible_command_on_guest "playbook", remote_command
end
result = execute_on_guest(remote_command) def execute_ansible_command_on_guest(name, command)
ui_running_ansible_command name, command
result = execute_on_guest(command)
raise Ansible::Errors::AnsibleCommandFailed if result != 0 raise Ansible::Errors::AnsibleCommandFailed if result != 0
end end