Skip to content

Commit 94c45a4

Browse files
committed
scripts/Makefile: remove python3 interpreter
Merge me. Signed-off-by: Daniel Gomez <[email protected]>
1 parent b95bf7f commit 94c45a4

9 files changed

+12
-26
lines changed

scripts/archive.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ci-archive:
1616
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
1717
--inventory localhost, \
1818
playbooks/kdevops_archive.yml \
19-
-e 'ansible_python_interpreter=/usr/bin/python3' \
2019
--extra-vars '{ $(ARCHIVE_DYNAMIC_RUNTIME_VARS) }' \
2120
--extra-vars=@./extra_vars.yaml
2221
endif

scripts/dynamic-pci-kconfig.Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ dynamic_pcipassthrough_kconfig:
4545
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
4646
--inventory localhost, \
4747
playbooks/gen-pci-kconfig.yml \
48-
--extra-vars '{ $(PCIE_RUNTIME_VARS) }' \
49-
-e 'ansible_python_interpreter=/usr/bin/python3'
48+
--extra-vars '{ $(PCIE_RUNTIME_VARS) }'
5049

5150
dynamic-kconfig-pci-help:
5251
@echo "dynconfig-pci - enables only pci dynamically generated kconfig content"

scripts/guestfs.Makefile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,41 +54,37 @@ KDEVOPS_PROVISION_DESTROY_METHOD := destroy_guestfs
5454
libvirt_pcie_passthrough_permissions:
5555
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
5656
--inventory localhost, \
57-
playbooks/libvirt_pcie_passthrough.yml \
58-
-e 'ansible_python_interpreter=/usr/bin/python3'
57+
playbooks/libvirt_pcie_passthrough.yml
5958

6059
$(KDEVOPS_PROVISIONED_SSH):
6160
$(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
6261
ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
6362
--inventory localhost, \
6463
playbooks/update_ssh_config_guestfs.yml \
6564
--extra-vars=@./extra_vars.yaml \
66-
-e 'ansible_python_interpreter=/usr/bin/python3' ;\
67-
LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \
65+
--extra-vars 'LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) \
66+
$(TOPDIR)/scripts/update_ssh_config_guestfs.py'; \
6867
fi
69-
$(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -e 'ansible_python_interpreter=/usr/bin/python3' -m wait_for_connection
68+
$(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -m wait_for_connection
7069
$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
7170

7271
install_libguestfs:
7372
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
7473
--inventory localhost, \
7574
playbooks/bringup_guestfs.yml \
76-
-e 'ansible_python_interpreter=/usr/bin/python3' \
7775
--extra-vars=@./extra_vars.yaml \
7876
--tags install-deps
7977

8078
bringup_guestfs: $(GUESTFS_BRINGUP_DEPS)
8179
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
8280
--inventory localhost, \
8381
playbooks/bringup_guestfs.yml \
84-
-e 'ansible_python_interpreter=/usr/bin/python3' \
8582
--extra-vars=@./extra_vars.yaml \
8683
--tags config-check,network,storage-pool-path
8784
$(Q)$(TOPDIR)/scripts/bringup_guestfs.sh
8885
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
8986
--inventory localhost, \
9087
playbooks/bringup_guestfs.yml \
91-
-e 'ansible_python_interpreter=/usr/bin/python3' \
9288
--extra-vars=@./extra_vars.yaml \
9389
--tags console-permissions
9490
PHONY += bringup_guestfs

scripts/install-menuconfig-deps.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ menuconfig-deps:
44
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
55
--inventory localhost, \
66
$(KDEVOPS_PLAYBOOKS_DIR)/install-menuconfig-deps.yml \
7-
-e 'ansible_python_interpreter=/usr/bin/python3' \
87
-e 'kdevops_first_run=True'
98
PHONY += menuconfig-deps
109

scripts/journal-server.Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ journal-client:
2020
journal-server:
2121
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
2222
--inventory localhost, \
23-
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml \
24-
-e 'ansible_python_interpreter=/usr/bin/python3'
23+
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml
2524

2625
journal-restart:
2726
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \

scripts/kconfig-ansible.Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

scripts/systemd-timesync.Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ timesyncd-client:
2929
timesyncd-server:
3030
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
3131
--inventory localhost, \
32-
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml \
33-
-e 'ansible_python_interpreter=/usr/bin/python3'
32+
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml
3433

3534
timesyncd-status:
3635
$(Q)timedatectl status

scripts/terraform.Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,13 @@ bringup_terraform:
182182
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
183183
--connection=local --inventory localhost, \
184184
playbooks/terraform.yml --tags bringup \
185-
--extra-vars=@./extra_vars.yaml \
186-
-e 'ansible_python_interpreter=/usr/bin/python3'
185+
--extra-vars=@./extra_vars.yaml
187186

188187
$(KDEVOPS_PROVISIONED_SSH):
189188
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
190189
-i $(KDEVOPS_HOSTFILE) \
191190
playbooks/terraform.yml --tags ssh \
192-
--extra-vars=@./extra_vars.yaml \
193-
-e 'ansible_python_interpreter=/usr/bin/python3'
191+
--extra-vars=@./extra_vars.yaml
194192
$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
195193

196194
status_terraform:
@@ -201,12 +199,10 @@ destroy_terraform:
201199
--connection=local -i $(KDEVOPS_HOSTFILE) \
202200
playbooks/terraform.yml --tags destroy \
203201
--extra-vars=@./extra_vars.yaml \
204-
-e 'ansible_python_interpreter=/usr/bin/python3'
205202
$(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG)
206203

207204
$(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config
208205
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
209206
--inventory localhost, \
210207
$(KDEVOPS_PLAYBOOKS_DIR)/gen_tfvars.yml \
211-
-e 'ansible_python_interpreter=/usr/bin/python3' \
212208
--extra-vars=@./extra_vars.yaml

scripts/vagrant.Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ vagrant_9p_linux_clone:
9191
libvirt_pcie_passthrough_permissions:
9292
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
9393
--inventory localhost, \
94-
playbooks/libvirt_pcie_passthrough.yml \
95-
-e 'ansible_python_interpreter=/usr/bin/python3'
94+
playbooks/libvirt_pcie_passthrough.yml
9695

9796
$(KDEVOPS_PROVISIONED_SSH):
9897
$(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
9998
ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
10099
--inventory localhost, \
101-
playbooks/update_ssh_config_vagrant.yml \
102-
-e 'ansible_python_interpreter=/usr/bin/python3' ;\
100+
playbooks/update_ssh_config_vagrant.yml
103101
fi
104102
$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
105103

0 commit comments

Comments
 (0)