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

FIX #11048, add parameter `pip_install_cmd` to `ansible_install.rb` for arch guest. 

ADD: Handling of `pip_install_cmd` in `ansible_install.rb` for arch guest.
This commit is contained in:
Stefan Koenen 2019-10-23 14:27:22 +02:00 committed by Brian Cain
parent 11c667a81d
commit 04aeff4cc6
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb
View File

@ -1,4 +1,5 @@
require_relative "../../../errors"
require_relative '../../../errors'
require_relative '../pip/pip'
module VagrantPlugins
module Ansible
@ -7,18 +8,34 @@ module VagrantPlugins
module Arch
module AnsibleInstall
def self.ansible_install(machine, install_mode, ansible_version, pip_args)
if install_mode != :default
raise Ansible::Errors::AnsiblePipInstallIsNotSupported
def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd='')
case install_mode
when :pip
pip_setup machine, pip_install_cmd
Pip::pip_install machine, 'ansible', ansible_version, pip_args, true
when :pip_args_only
pip_setup machine, pip_install_cmd
Pip::pip_install machine, '', '', pip_args, false
else
machine.communicate.sudo "pacman -Syy --noconfirm"
machine.communicate.sudo "pacman -S --noconfirm ansible"
machine.communicate.sudo 'pacman -Syy --noconfirm'
machine.communicate.sudo 'pacman -S --noconfirm ansible'
end
end
def self.pip_setup(machine, pip_install_cmd='')
machine.communicate.sudo 'pacman -Syy --noconfirm'
machine.communicate.sudo 'pacman -S --noconfirm base-devel curl git'
Pip::get_pip machine, pip_install_cmd
end
end
end
end
end
end
end