From: Daniel Gomez <da.gomez@kernel.org>
To: Daniel Gomez <da.gomez@samsung.com>,
Luis Chamberlain <mcgrof@kernel.org>
Cc: kdevops@lists.linux.dev, Daniel Gomez <da.gomez@kernel.org>
Subject: [PATCH 2/2] Makefile: remove ansible_python_interpreter
Date: Fri, 04 Apr 2025 20:01:16 +0000 [thread overview]
Message-ID: <20250404-python-interpreter-v1-2-04783b627ce7@samsung.com> (raw)
In-Reply-To: <20250404-python-interpreter-v1-0-04783b627ce7@samsung.com>
From: Daniel Gomez <da.gomez@samsung.com>
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 <da.gomez@samsung.com>
---
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 +++++---------
| 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
--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
next prev parent reply other threads:[~2025-04-04 20:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 20:01 [PATCH 0/2] python interpreter in ansible.cfg Daniel Gomez
2025-04-04 20:01 ` [PATCH 1/2] ansible_cfg: add python interpreter support Daniel Gomez
2025-04-04 20:01 ` Daniel Gomez [this message]
2025-04-04 23:39 ` [PATCH 0/2] python interpreter in ansible.cfg Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250404-python-interpreter-v1-2-04783b627ce7@samsung.com \
--to=da.gomez@kernel.org \
--cc=da.gomez@samsung.com \
--cc=kdevops@lists.linux.dev \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.