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

Merge pull request #11098 from briancain/finalize-ansible-config-values 

Fixes #10950: Ensure pip_install_cmd is finalized
This commit is contained in:
Brian Cain 2019-10-02 12:51:33 -07:00 committed by GitHub
parent 03ad01f158 96c20ad3cc
commit 968a126405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/provisioners/ansible/cap/guest/pip/pip.rb
View File

@ -21,7 +21,6 @@ module VagrantPlugins
end end
def self.get_pip(machine, pip_install_cmd=DEFAULT_PIP_INSTALL_CMD) def self.get_pip(machine, pip_install_cmd=DEFAULT_PIP_INSTALL_CMD)
# The objective here is to get pip either by default # The objective here is to get pip either by default
# or by the argument passed in. The objective is not # or by the argument passed in. The objective is not
# to circumvent the pip setup by passing in nothing. # to circumvent the pip setup by passing in nothing.

4
plugins/provisioners/ansible/config/guest.rb
View File

@ -19,7 +19,7 @@ module VagrantPlugins
@install = UNSET_VALUE @install = UNSET_VALUE
@install_mode = UNSET_VALUE @install_mode = UNSET_VALUE
@pip_args = UNSET_VALUE @pip_args = UNSET_VALUE
@pip_install_cmd = UNSET_VALUE @pip_install_cmd = UNSET_VALUE
@provisioning_path = UNSET_VALUE @provisioning_path = UNSET_VALUE
@tmp_path = UNSET_VALUE @tmp_path = UNSET_VALUE
end end
@ -30,7 +30,7 @@ module VagrantPlugins
@install = true if @install == UNSET_VALUE @install = true if @install == UNSET_VALUE
@install_mode = :default if @install_mode == UNSET_VALUE @install_mode = :default if @install_mode == UNSET_VALUE
@pip_args = "" if @pip_args == UNSET_VALUE @pip_args = "" if @pip_args == UNSET_VALUE
@pip_install_cmd = "" if @pip_args == UNSET_VALUE @pip_install_cmd = "" if @pip_install_cmd == UNSET_VALUE
@provisioning_path = "/vagrant" if provisioning_path == UNSET_VALUE @provisioning_path = "/vagrant" if provisioning_path == UNSET_VALUE
@tmp_path = "/tmp/vagrant-ansible" if tmp_path == UNSET_VALUE @tmp_path = "/tmp/vagrant-ansible" if tmp_path == UNSET_VALUE
end end

2
plugins/provisioners/ansible/provisioner/guest.rb
View File

@ -33,7 +33,7 @@ module VagrantPlugins
# Current limitations: # Current limitations:
# - The installation of a specific Ansible version is only supported by # - The installation of a specific Ansible version is only supported by
# the "pip" install_mode. Note that "pip" installation also takes place # the "pip" install_mode. Note that "pip" installation also takes place
# via a default command. If pip needs to be installed differently then # via a default command. If pip needs to be installed differently then
# the command can be overwritten by supplying "pip_install_cmd" in the # the command can be overwritten by supplying "pip_install_cmd" in the
# config settings. # config settings.
# - There is no absolute guarantee that the automated installation will replace # - There is no absolute guarantee that the automated installation will replace

1
test/unit/plugins/provisioners/ansible/config/guest_test.rb
View File

@ -61,6 +61,7 @@ describe VagrantPlugins::Ansible::Config::Guest do
expect(subject.install_mode).to eql(:default) expect(subject.install_mode).to eql(:default)
expect(subject.provisioning_path).to eql("/vagrant") expect(subject.provisioning_path).to eql("/vagrant")
expect(subject.tmp_path).to eql("/tmp/vagrant-ansible") expect(subject.tmp_path).to eql("/tmp/vagrant-ansible")
expect(subject.pip_install_cmd).to eql("")
end end
end end