plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb in vagrant-unbundled-2.2.4.0 vs plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb in vagrant-unbundled-2.2.5.0
- old
+ new
@@ -6,17 +6,17 @@
module Guest
module Debian
module AnsibleInstall
- def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+ def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
case install_mode
when :pip
- pip_setup machine
+ pip_setup machine, pip_install_cmd
Pip::pip_install machine, "ansible", ansible_version, pip_args, true
when :pip_args_only
- pip_setup machine
+ pip_setup machine, pip_install_cmd
Pip::pip_install machine, "", "", pip_args, false
else
ansible_apt_install machine
end
end
@@ -34,13 +34,13 @@
machine.communicate.sudo install_backports_if_wheezy_release
machine.communicate.sudo "apt-get update -y -qq"
machine.communicate.sudo "apt-get install -y -qq ansible"
end
- def self.pip_setup(machine)
+ def self.pip_setup(machine, pip_install_cmd="")
machine.communicate.sudo "apt-get update -y -qq"
machine.communicate.sudo "apt-get install -y -qq build-essential curl git libssl-dev libffi-dev python-dev"
- Pip::get_pip machine
+ Pip::get_pip machine, pip_install_cmd
end
end
end
end