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:
parent
11c667a81d
commit
04aeff4cc6
|
@ -1,4 +1,5 @@
|
||||||
require_relative "../../../errors"
|
require_relative '../../../errors'
|
||||||
|
require_relative '../pip/pip'
|
||||||
|
|
||||||
module VagrantPlugins
|
module VagrantPlugins
|
||||||
module Ansible
|
module Ansible
|
||||||
|
@ -7,18 +8,34 @@ module VagrantPlugins
|
||||||
module Arch
|
module Arch
|
||||||
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='')
|
||||||
if install_mode != :default
|
case install_mode
|
||||||
raise Ansible::Errors::AnsiblePipInstallIsNotSupported
|
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
|
else
|
||||||
machine.communicate.sudo "pacman -Syy --noconfirm"
|
machine.communicate.sudo 'pacman -Syy --noconfirm'
|
||||||
machine.communicate.sudo "pacman -S --noconfirm ansible"
|
machine.communicate.sudo 'pacman -S --noconfirm ansible'
|
||||||
end
|
end
|
||||||
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
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue