From 94a888b260c97a6f6352fbea0bc26ce68b40be74 Mon Sep 17 00:00:00 2001 From: Patrick Poortman Date: Tue, 2 Apr 2024 14:37:07 +0200 Subject: [PATCH 1/2] Fix ansible version gathering in host provisioner --- plugins/provisioners/ansible/provisioner/host.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb index ce3752f40..9f9dc5d0d 100644 --- a/plugins/provisioners/ansible/provisioner/host.rb +++ b/plugins/provisioners/ansible/provisioner/host.rb @@ -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] From 543616285117b74253917b68fd15d0b0f1639f02 Mon Sep 17 00:00:00 2001 From: Patrick Poortman Date: Tue, 2 Apr 2024 15:18:20 +0200 Subject: [PATCH 2/2] Fix Python command in ansible provisioner tests --- test/unit/plugins/provisioners/ansible/provisioner_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb index c6566d2d4..b4466d21e 100644 --- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb +++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb @@ -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