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

Exposing pip_install_cmd to callers as optional.

This commit is contained in:
Vidroha Debroy 2019-01-25 15:09:31 -06:00
parent 84df098135
commit 614523a5fc
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
View File

@ -8,13 +8,13 @@ module VagrantPlugins
module AnsibleInstall 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 case install_mode
when :pip when :pip
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "ansible", ansible_version, pip_args, true Pip::pip_install machine, "ansible", ansible_version, pip_args, true
when :pip_args_only when :pip_args_only
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "", "", pip_args, false Pip::pip_install machine, "", "", pip_args, false
else else
ansible_apt_install machine ansible_apt_install machine
@ -36,10 +36,10 @@ INLINE_CRIPT
machine.communicate.sudo "apt-get install -y -qq ansible" machine.communicate.sudo "apt-get install -y -qq ansible"
end 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 update -y -qq"
machine.communicate.sudo "apt-get install -y -qq build-essential curl git libssl-dev libffi-dev python-dev" 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

10
plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
View File

@ -8,13 +8,13 @@ module VagrantPlugins
module Fedora module Fedora
module AnsibleInstall 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 case install_mode
when :pip when :pip
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "ansible", ansible_version, pip_args, true Pip::pip_install machine, "ansible", ansible_version, pip_args, true
when :pip_args_only when :pip_args_only
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "", "", pip_args, false Pip::pip_install machine, "", "", pip_args, false
else else
rpm_package_manager = Facts::rpm_package_manager(machine) rpm_package_manager = Facts::rpm_package_manager(machine)
@ -25,11 +25,11 @@ module VagrantPlugins
private private
def self.pip_setup(machine) def self.pip_setup(machine, pip_install_cmd="")
rpm_package_manager = Facts::rpm_package_manager(machine) rpm_package_manager = Facts::rpm_package_manager(machine)
machine.communicate.sudo "#{rpm_package_manager} install -y curl gcc gmp-devel libffi-devel openssl-devel python-crypto python-devel python-dnf python-setuptools redhat-rpm-config" machine.communicate.sudo "#{rpm_package_manager} install -y curl gcc gmp-devel libffi-devel openssl-devel python-crypto python-devel python-dnf python-setuptools redhat-rpm-config"
Pip::get_pip machine Pip::get_pip machine, pip_install_cmd
end end
end end

10
plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
View File

@ -8,13 +8,13 @@ module VagrantPlugins
module RedHat module RedHat
module AnsibleInstall 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 case install_mode
when :pip when :pip
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "ansible", ansible_version, pip_args, true Pip::pip_install machine, "ansible", ansible_version, pip_args, true
when :pip_args_only when :pip_args_only
pip_setup machine pip_setup machine, pip_install_cmd
Pip::pip_install machine, "", "", pip_args, false Pip::pip_install machine, "", "", pip_args, false
else else
ansible_rpm_install machine ansible_rpm_install machine
@ -33,11 +33,11 @@ module VagrantPlugins
machine.communicate.sudo "#{rpm_package_manager} -y --enablerepo=epel install ansible" machine.communicate.sudo "#{rpm_package_manager} -y --enablerepo=epel install ansible"
end end
def self.pip_setup(machine) def self.pip_setup(machine, pip_install_cmd="")
rpm_package_manager = Facts::rpm_package_manager(machine) rpm_package_manager = Facts::rpm_package_manager(machine)
machine.communicate.sudo("#{rpm_package_manager} -y install curl gcc libffi-devel openssl-devel python-crypto python-devel python-setuptools") machine.communicate.sudo("#{rpm_package_manager} -y install curl gcc libffi-devel openssl-devel python-crypto python-devel python-setuptools")
Pip::get_pip machine Pip::get_pip machine, pip_install_cmd
end end
end end