From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB5D1221555 for ; Fri, 4 Apr 2025 20:01:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743796884; cv=none; b=MQtZOStdJFpC6+xa9Gt1snwPh4ZGS/2CoVGJlkxt1yMQE5vLY2t9yo6xL6i0s3kgr1z1GRNUO94Cv9jQZeh5CL3dmhMBt2pajq+eG1XAiMdlvMxPeRoY9V2u36chLMWUgLsPUlU/qe6QMRxny4CfEvJLfH0N2rkyVxdCHO7Kif4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743796884; c=relaxed/simple; bh=yd9MUIJikgvv1SLBkesNyPmxF0pndzvJd8hpnRnGzSw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S1MNcWESGoqUn8PfEUUaM+0jbKTP0h8t+KSOzzlVg1M238KAxOv11lgC9mcS1Cmr+oImMHmPt9VOYsrLZfEnho6DOtcwd6mJRcMPtC28sZ8CTb7VbTDrhByhfHP78wRpA5M6rht39KYxn11NtE4EGgbXyDKQuBWSfUwf7iMPN20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ls/6Phfy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ls/6Phfy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25A67C4CEE9; Fri, 4 Apr 2025 20:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743796884; bh=yd9MUIJikgvv1SLBkesNyPmxF0pndzvJd8hpnRnGzSw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ls/6Phfyk1COW/0xj+uMRXQYEW0KTByaiug02r9X8oQDGKu4uftsNUUXJampcXQ7E 5ENAm7A+uUNQnBIXUg7WhlxsED5dcqeID6kwPu61+kWabl8/MBOZwxV+FLcaZSbVJX gOU88pTRLsiwTK6mIQjuAIxQ8IQshGAeM6JmfteAovbvO++LDxSztpg1ed9MWj/DyE N5SSQcHQ48DHjoSJ+oGAr+RNQ5Hi8eLemezzRm2wNLBM5rILpwcJPqGs3ybTrMa4GT sCvoAPocYB7ZnX6Z7Mm347/zywKMRtj06oSEkf+V1B59YSuEiF2j9tbvBvKrgljQ5j tfdnDVyrG27hg== From: Daniel Gomez Date: Fri, 04 Apr 2025 20:01:16 +0000 Subject: [PATCH 2/2] Makefile: remove ansible_python_interpreter Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250404-python-interpreter-v1-2-04783b627ce7@samsung.com> References: <20250404-python-interpreter-v1-0-04783b627ce7@samsung.com> In-Reply-To: <20250404-python-interpreter-v1-0-04783b627ce7@samsung.com> To: Daniel Gomez , Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez We can now set the Python Interpreter globally in the ansible.cfg and with Kconfig or cli. Drop support for the calls where ansible-playbook was specifying the interpreter with ansible_python_interpreter inventory variable. Signed-off-by: Daniel Gomez --- Makefile | 2 -- Makefile.build_qemu | 4 ---- Makefile.hypervisor-tunings | 1 - Makefile.kdevops | 21 +++++++-------------- Makefile.linux-mirror | 2 -- Makefile.postfix | 1 - scripts/archive.Makefile | 1 - scripts/dynamic-pci-kconfig.Makefile | 3 +-- scripts/guestfs.Makefile | 14 +++++--------- scripts/install-menuconfig-deps.Makefile | 1 - scripts/journal-server.Makefile | 3 +-- scripts/kconfig-ansible.Makefile | 1 + scripts/systemd-timesync.Makefile | 3 +-- scripts/terraform.Makefile | 8 ++------ scripts/vagrant.Makefile | 6 ++---- 15 files changed, 20 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index fed5761f26ee0b234e9bf6bf1b664cfb54af4da6..e92c4e100a988dc2a8d66e59ef3f0df5566c81e6 100644 --- a/Makefile +++ b/Makefile @@ -228,7 +228,6 @@ $(KDEVOPS_HOSTS): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_hosts.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml DEFAULT_DEPS += $(KDEVOPS_NODES) @@ -236,7 +235,6 @@ $(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config ansible.cfg $(KDEVOPS_NODES_TEMPLAT $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml DEFAULT_DEPS += $(LOCALHOST_SETUP_WORK) diff --git a/Makefile.build_qemu b/Makefile.build_qemu index 2c011e6f459821e9d19fcb1db1a8079880234290..72e1cba4dfbccccf8c546c613b788a26be86ee3f 100644 --- a/Makefile.build_qemu +++ b/Makefile.build_qemu @@ -23,7 +23,6 @@ qemu: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml PHONY += qemu @@ -31,7 +30,6 @@ qemu-install: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml --tags vars,install PHONY += qemu-install @@ -39,7 +37,6 @@ qemu-configure: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml --tags vars,configure PHONY += qemu-configure @@ -47,7 +44,6 @@ qemu-build: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml --tags vars,build PHONY += qemu-build diff --git a/Makefile.hypervisor-tunings b/Makefile.hypervisor-tunings index 19712b858a64d4863d4cfb28ee165aa8d56da1e1..39547c02f1b68a5bfb4ea770f37e4d3563109532 100644 --- a/Makefile.hypervisor-tunings +++ b/Makefile.hypervisor-tunings @@ -17,7 +17,6 @@ kdevops_hypervisor_tunning: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/hypervisor-tuning.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml PHONY += kdevops_hypervisor_tunning diff --git a/Makefile.kdevops b/Makefile.kdevops index 9a284338cda2ad57a881d6cdb7fd8029263f65f2..2c36dce47eb11fb1b736f0405b7f1f9303ae4d40 100644 --- a/Makefile.kdevops +++ b/Makefile.kdevops @@ -11,28 +11,24 @@ PHONY := kdevops_all kdevops_terraform_deps: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/install_terraform.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/install_terraform.yml PHONY += kdevops_terraform_deps kdevops_vagrant_install_vagrant: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant.yml kdevops_install_libvirt: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" kdevops_configure_libvirt: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \ - -e 'running_user=$(USER)' \ - -e 'ansible_python_interpreter=/usr/bin/python3' + -e 'running_user=$(USER)' kdevops_vagrant_deps: \ kdevops_vagrant_install_vagrant \ @@ -45,16 +41,14 @@ KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps kdevops_vagrant_boxes: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml PHONY += kdevops_vagrant_boxes KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes kdevops_verify_libvirt_user: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" PHONY += kdevops_verify_libvirt_user KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user @@ -62,8 +56,7 @@ KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user kdevops_libvirt_storage_pool_create: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml PHONY += kdevops_libvirt_storage_pool_create KDEVOPS_VAGRANT_WORK += kdevops_libvirt_storage_pool_create diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror index 54d6539157600fae0b91f414ad766692e3bf73c3..6961a55b47ce0796b39841ae125f52f07f11a96f 100644 --- a/Makefile.linux-mirror +++ b/Makefile.linux-mirror @@ -29,7 +29,6 @@ kdevops_linux_mirror: $(KDEVOPS_EXTRA_VARS) --inventory localhost, \ --tags vars,mirror \ $(KDEVOPS_PLAYBOOKS_DIR)/linux-mirror.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml PHONY += kdevops_linux_mirror @@ -42,7 +41,6 @@ mirror-status: $(KDEVOPS_EXTRA_VARS) --inventory localhost, \ --tags vars,mirror-status \ $(KDEVOPS_PLAYBOOKS_DIR)/linux-mirror.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml PHONY += mirror-status diff --git a/Makefile.postfix b/Makefile.postfix index 38fd90b2c88377554947f4cd6b7b50bccf2b29be..5db23dc973711dfbd697d5b353e64e257c8f1d0d 100644 --- a/Makefile.postfix +++ b/Makefile.postfix @@ -10,7 +10,6 @@ kdevops_postfix_setup_relay: $(KDEVOPS_EXTRA_VARS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/postfix_relay_host.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml PHONY += kdevos_postfix_setup_relay ANSIBLE_EXTRA_ARGS += $(POSTFIX_SETUP_ARGS) diff --git a/scripts/archive.Makefile b/scripts/archive.Makefile index 56c936e941986c97268655b477863cf6d15849ab..54928d328472bb89e03ea0b11c259dbfabbe1c09 100644 --- a/scripts/archive.Makefile +++ b/scripts/archive.Makefile @@ -16,7 +16,6 @@ ci-archive: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/kdevops_archive.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars '{ $(ARCHIVE_DYNAMIC_RUNTIME_VARS) }' \ --extra-vars=@./extra_vars.yaml endif diff --git a/scripts/dynamic-pci-kconfig.Makefile b/scripts/dynamic-pci-kconfig.Makefile index 0878f267e9098413060f8edac3b109d60637015c..716cdc1e4814a26532c8bb3550670cdd1e4caf3a 100644 --- a/scripts/dynamic-pci-kconfig.Makefile +++ b/scripts/dynamic-pci-kconfig.Makefile @@ -45,8 +45,7 @@ dynamic_pcipassthrough_kconfig: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/gen-pci-kconfig.yml \ - --extra-vars '{ $(PCIE_RUNTIME_VARS) }' \ - -e 'ansible_python_interpreter=/usr/bin/python3' + --extra-vars '{ $(PCIE_RUNTIME_VARS) }' dynamic-kconfig-pci-help: @echo "dynconfig-pci - enables only pci dynamically generated kconfig content" diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index e1cf25d62d0492fe0a27f382041529b4b5439324..3dad6a14f0c5a50cb06d06285bac3b66ca490962 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -54,26 +54,24 @@ KDEVOPS_PROVISION_DESTROY_METHOD := destroy_guestfs libvirt_pcie_passthrough_permissions: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - playbooks/libvirt_pcie_passthrough.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + playbooks/libvirt_pcie_passthrough.yml $(KDEVOPS_PROVISIONED_SSH): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/update_ssh_config_guestfs.yml \ - --extra-vars=@./extra_vars.yaml \ - -e 'ansible_python_interpreter=/usr/bin/python3' ;\ - LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ + --extra-vars=@./extra_vars.yaml; \ + LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) \ + $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \ fi - $(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -e 'ansible_python_interpreter=/usr/bin/python3' -m wait_for_connection + $(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -m wait_for_connection $(Q)touch $(KDEVOPS_PROVISIONED_SSH) install_libguestfs: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/bringup_guestfs.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml \ --tags install-deps @@ -81,14 +79,12 @@ bringup_guestfs: $(GUESTFS_BRINGUP_DEPS) $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/bringup_guestfs.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml \ --tags config-check,network,storage-pool-path $(Q)$(TOPDIR)/scripts/bringup_guestfs.sh $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ playbooks/bringup_guestfs.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml \ --tags console-permissions PHONY += bringup_guestfs diff --git a/scripts/install-menuconfig-deps.Makefile b/scripts/install-menuconfig-deps.Makefile index 25fdbbc95658ef9e9812baf5a7089c3abe8959ff..772e65df2528d1fdd191b7fad4ae68ebe0e35979 100644 --- a/scripts/install-menuconfig-deps.Makefile +++ b/scripts/install-menuconfig-deps.Makefile @@ -4,7 +4,6 @@ menuconfig-deps: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/install-menuconfig-deps.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ -e 'kdevops_first_run=True' PHONY += menuconfig-deps diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile index 49455f626b787c0359a171f65f454040733ff8cf..493c768b63212b6d249abacb93395a509ae5348e 100644 --- a/scripts/journal-server.Makefile +++ b/scripts/journal-server.Makefile @@ -20,8 +20,7 @@ journal-client: journal-server: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml journal-restart: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \ diff --git a/scripts/kconfig-ansible.Makefile b/scripts/kconfig-ansible.Makefile new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/scripts/kconfig-ansible.Makefile @@ -0,0 +1 @@ + diff --git a/scripts/systemd-timesync.Makefile b/scripts/systemd-timesync.Makefile index be6f0ab2321b1f6e844309ae5d1442df3d5d182d..f62edc0c7e57bac1de031b350247e0e810e117d5 100644 --- a/scripts/systemd-timesync.Makefile +++ b/scripts/systemd-timesync.Makefile @@ -29,8 +29,7 @@ timesyncd-client: timesyncd-server: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + $(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml timesyncd-status: $(Q)timedatectl status diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 02d2af51d8a3c8212eb75f3e37308d387ce2c6ee..fdef2e8c53b494a5ae37168f761f4429773f43a6 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -159,15 +159,13 @@ bringup_terraform: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ --connection=local --inventory localhost, \ playbooks/terraform.yml --tags bringup \ - --extra-vars=@./extra_vars.yaml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + --extra-vars=@./extra_vars.yaml $(KDEVOPS_PROVISIONED_SSH): $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ -i $(KDEVOPS_HOSTFILE) \ playbooks/terraform.yml --tags ssh \ - --extra-vars=@./extra_vars.yaml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + --extra-vars=@./extra_vars.yaml $(Q)touch $(KDEVOPS_PROVISIONED_SSH) status_terraform: @@ -178,12 +176,10 @@ destroy_terraform: --connection=local -i $(KDEVOPS_HOSTFILE) \ playbooks/terraform.yml --tags destroy \ --extra-vars=@./extra_vars.yaml \ - -e 'ansible_python_interpreter=/usr/bin/python3' $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) $(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ $(KDEVOPS_PLAYBOOKS_DIR)/gen_tfvars.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' \ --extra-vars=@./extra_vars.yaml diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile index 664c8f9cfc5c9ac879c5c7a6dd6414d0add848db..fc69fb91f53f591ee9156aedc78d28d559b8b835 100644 --- a/scripts/vagrant.Makefile +++ b/scripts/vagrant.Makefile @@ -91,15 +91,13 @@ vagrant_9p_linux_clone: libvirt_pcie_passthrough_permissions: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - playbooks/libvirt_pcie_passthrough.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' + playbooks/libvirt_pcie_passthrough.yml $(KDEVOPS_PROVISIONED_SSH): $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \ ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \ --inventory localhost, \ - playbooks/update_ssh_config_vagrant.yml \ - -e 'ansible_python_interpreter=/usr/bin/python3' ;\ + playbooks/update_ssh_config_vagrant.yml fi $(Q)touch $(KDEVOPS_PROVISIONED_SSH) -- 2.47.2