From 67e6f9911e0099f5e6a8bfbda048a61943f344c4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 30 May 2019 23:28:27 +0000 Subject: [PATCH] Revert "ansible: drop each host/group setting ansible_python_interpreter and just change the interpreter_python value on the control host." This reverts commit 5caa9024c5a38139ad601a973e3efbbbeffc8fd8. --- inventory/group_vars/buildvm_stg | 1 + inventory/group_vars/openqa_stg | 3 +++ inventory/group_vars/openqa_stg_workers | 3 +++ inventory/group_vars/releng_compose | 2 ++ inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org | 1 + inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org | 1 + inventory/host_vars/f29-test.fedorainfracloud.org | 1 + inventory/host_vars/f30-test.fedorainfracloud.org | 1 + inventory/host_vars/ppc9-01.ppc.fedoraproject.org | 1 + inventory/host_vars/ppc9-02.ppc.fedoraproject.org | 1 + inventory/host_vars/rawhide-test.fedorainfracloud.org | 1 + 11 files changed, 16 insertions(+) diff --git a/inventory/group_vars/buildvm_stg b/inventory/group_vars/buildvm_stg index 98947bae79..33f8fd9756 100644 --- a/inventory/group_vars/buildvm_stg +++ b/inventory/group_vars/buildvm_stg @@ -7,6 +7,7 @@ max_mem_size: "{{ mem_size }}" num_cpus: 4 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-30 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/ +ansible_python_interpreter: /usr/bin/python3 nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 diff --git a/inventory/group_vars/openqa_stg b/inventory/group_vars/openqa_stg index 457f57478a..8edd353e7a 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -12,6 +12,9 @@ # this is to enable nested virt, which we need for disk image creation virt_install_command: "{{ virt_install_command_one_nic }} --cpu=host-passthrough,+vmx" +# These boxes are F30, so we need Python 3 ansible +ansible_python_interpreter: /usr/bin/python3 + external_hostname: openqa.stg.fedoraproject.org openqa_static_uid: 601 diff --git a/inventory/group_vars/openqa_stg_workers b/inventory/group_vars/openqa_stg_workers index b08d62e60a..af52af9d5d 100644 --- a/inventory/group_vars/openqa_stg_workers +++ b/inventory/group_vars/openqa_stg_workers @@ -4,5 +4,8 @@ openqa_hostname: openqa-stg01.qa.fedoraproject.org openqa_key: "{{ stg_openqa_apikey }}" openqa_secret: "{{ stg_openqa_apisecret }}" +# These boxes are F30, so we need Python 3 ansible +ansible_python_interpreter: /usr/bin/python3 + deployment_type: stg freezes: false diff --git a/inventory/group_vars/releng_compose b/inventory/group_vars/releng_compose index 644ee62eb5..9106e9d6f8 100644 --- a/inventory/group_vars/releng_compose +++ b/inventory/group_vars/releng_compose @@ -31,6 +31,8 @@ koji_server_url: "https://koji.fedoraproject.org/kojihub" koji_weburl: "https://koji.fedoraproject.org/koji" koji_topurl: "https://kojipkgs.fedoraproject.org/" +ansible_python_interpreter: /usr/bin/python3 + # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org index afae2f35e7..dfd0bc4d0b 100644 --- a/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org @@ -13,3 +13,4 @@ virt_install_command: "{{ virt_install_command_armv7_one_nic }}" ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-29-armv7 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Everything/armhfp/os/ +ansible_python_interpreter: "/usr/bin/python3" diff --git a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org index 2c9bdf8f81..adfa4b3daa 100644 --- a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org @@ -3,3 +3,4 @@ vmhost: aarch64-c22n1.arm.fedoraproject.org eth0_ip: 10.5.129.176 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-29-armv7 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Everything/armhfp/os/ +ansible_python_interpreter: "/usr/bin/python3" diff --git a/inventory/host_vars/f29-test.fedorainfracloud.org b/inventory/host_vars/f29-test.fedorainfracloud.org index 6d3ac29c79..00be3b4fd4 100644 --- a/inventory/host_vars/f29-test.fedorainfracloud.org +++ b/inventory/host_vars/f29-test.fedorainfracloud.org @@ -11,6 +11,7 @@ inventory_instance_name: f29-test hostbase: f29-test public_ip: 209.132.184.211 description: f29-test instance +ansible_python_interpreter: /usr/bin/python3 cloud_networks: # maintainertest-net diff --git a/inventory/host_vars/f30-test.fedorainfracloud.org b/inventory/host_vars/f30-test.fedorainfracloud.org index 6b493e6af5..73c376ecd8 100644 --- a/inventory/host_vars/f30-test.fedorainfracloud.org +++ b/inventory/host_vars/f30-test.fedorainfracloud.org @@ -11,6 +11,7 @@ inventory_instance_name: f30-test hostbase: f30-test public_ip: 209.132.184.157 description: f30-test instance +ansible_python_interpreter: /usr/bin/python3 cloud_networks: # maintainertest-net diff --git a/inventory/host_vars/ppc9-01.ppc.fedoraproject.org b/inventory/host_vars/ppc9-01.ppc.fedoraproject.org index ed97d539c0..e425179f89 100644 --- a/inventory/host_vars/ppc9-01.ppc.fedoraproject.org +++ b/inventory/host_vars/ppc9-01.ppc.fedoraproject.org @@ -1 +1,2 @@ --- +ansible_python_interpreter: /usr/bin/python3 diff --git a/inventory/host_vars/ppc9-02.ppc.fedoraproject.org b/inventory/host_vars/ppc9-02.ppc.fedoraproject.org index ed97d539c0..e425179f89 100644 --- a/inventory/host_vars/ppc9-02.ppc.fedoraproject.org +++ b/inventory/host_vars/ppc9-02.ppc.fedoraproject.org @@ -1 +1,2 @@ --- +ansible_python_interpreter: /usr/bin/python3 diff --git a/inventory/host_vars/rawhide-test.fedorainfracloud.org b/inventory/host_vars/rawhide-test.fedorainfracloud.org index 6d2d788155..1c5d72d549 100644 --- a/inventory/host_vars/rawhide-test.fedorainfracloud.org +++ b/inventory/host_vars/rawhide-test.fedorainfracloud.org @@ -11,6 +11,7 @@ inventory_instance_name: rawhide-test hostbase: rawhide-test public_ip: 209.132.184.212 description: rawhide-test instance +ansible_python_interpreter: /usr/bin/python3 cloud_networks: # maintainertest-net