upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-06-09 00:32:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13375 from patrickpoortman/fix_gather_ansible_version

Browse source 
provisioner/ansible: Fix ansible version gathering in host provisioner
This commit is contained in:
Chris Roberts 2024-07-10 16:25:23 -07:00 committed by GitHub
commit 558682ad5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/provisioners/ansible/provisioner/host.rb
View file

@ -113,7 +113,7 @@ module VagrantPlugins
def gather_ansible_version
raw_output = ''
command = ['python3', '-c',
"\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\""]
"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))"]
command << {
notify: [:stdout, :stderr]

4
test/unit/plugins/provisioners/ansible/provisioner_test.rb
View file

@ -77,7 +77,7 @@ VF
def self.it_should_check_ansible_version
it "execute 'Python ansible version check before executing 'ansible-playbook'" do
expect(Vagrant::Util::Subprocess).to receive(:execute)
.once.with('python3', '-c', "\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\"", { notify: %i[
.once.with('python3', '-c', "import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))", { notify: %i[
stdout stderr
] })
expect(Vagrant::Util::Subprocess).to receive(:execute)
@ -1054,7 +1054,7 @@ VF
expect(Vagrant::Util::Subprocess).to receive(:execute)
.once
.with('python3', '-c',
"\"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))\"", { notify: %i[stdout stderr] })
"import importlib.metadata; print('ansible ' + importlib.metadata.version('ansible'))", { notify: %i[stdout stderr] })
.and_return(default_execute_result)
expect(Vagrant::Util::Subprocess).to receive(:execute)
.once