diff --git a/inventory/group_vars/buildvm_stg b/inventory/group_vars/buildvm_stg index 33f8fd9756..98947bae79 100644 --- a/inventory/group_vars/buildvm_stg +++ b/inventory/group_vars/buildvm_stg @@ -7,7 +7,6 @@ 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 8edd353e7a..457f57478a 100644 --- a/inventory/group_vars/openqa_stg +++ b/inventory/group_vars/openqa_stg @@ -12,9 +12,6 @@ # 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 af52af9d5d..b08d62e60a 100644 --- a/inventory/group_vars/openqa_stg_workers +++ b/inventory/group_vars/openqa_stg_workers @@ -4,8 +4,5 @@ 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 9106e9d6f8..644ee62eb5 100644 --- a/inventory/group_vars/releng_compose +++ b/inventory/group_vars/releng_compose @@ -31,8 +31,6 @@ 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 dfd0bc4d0b..afae2f35e7 100644 --- a/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org @@ -13,4 +13,3 @@ 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 adfa4b3daa..2c9bdf8f81 100644 --- a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org @@ -3,4 +3,3 @@ 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 00be3b4fd4..6d3ac29c79 100644 --- a/inventory/host_vars/f29-test.fedorainfracloud.org +++ b/inventory/host_vars/f29-test.fedorainfracloud.org @@ -11,7 +11,6 @@ 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 73c376ecd8..6b493e6af5 100644 --- a/inventory/host_vars/f30-test.fedorainfracloud.org +++ b/inventory/host_vars/f30-test.fedorainfracloud.org @@ -11,7 +11,6 @@ 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 e425179f89..ed97d539c0 100644 --- a/inventory/host_vars/ppc9-01.ppc.fedoraproject.org +++ b/inventory/host_vars/ppc9-01.ppc.fedoraproject.org @@ -1,2 +1 @@ --- -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 e425179f89..ed97d539c0 100644 --- a/inventory/host_vars/ppc9-02.ppc.fedoraproject.org +++ b/inventory/host_vars/ppc9-02.ppc.fedoraproject.org @@ -1,2 +1 @@ --- -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 1c5d72d549..6d2d788155 100644 --- a/inventory/host_vars/rawhide-test.fedorainfracloud.org +++ b/inventory/host_vars/rawhide-test.fedorainfracloud.org @@ -11,7 +11,6 @@ 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 diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index 14bc86d231..e3962303e6 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -29,6 +29,10 @@ forks = 150 #module_lang = C #module_set_locale = False +# auto detect the python to use on targets based on table, +# then searching a python path for one. +interpreter_python=auto + # plays will gather facts by default, which contain information about # the remote system. #