plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb in vagrant-unbundled-1.9.1.1 vs plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb in vagrant-unbundled-1.9.5.1
- old
+ new
@@ -6,20 +6,20 @@
module Guest
module Debian
module AnsibleInstall
- def self.ansible_install(machine, install_mode, ansible_version)
- if (install_mode == :pip)
- ansible_pip_install machine, ansible_version
+ def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+ case install_mode
+ when :pip
+ pip_setup machine
+ Pip::pip_install machine, "ansible", ansible_version, pip_args, true
+ when :pip_args_only
+ pip_setup machine
+ Pip::pip_install machine, "", "", pip_args, false
else
ansible_apt_install machine
end
- end
-
- def self.ansible_pip_install(machine, ansible_version)
- pip_setup machine
- Pip::pip_install machine, "ansible", ansible_version
end
private
def self.ansible_apt_install(machine)