inventory: try removing all the calls to ansible_python_interpreter and rely on the auto detection.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-11-14 20:30:28 +00:00 · 2019-11-14 20:30:28 +00:00 · db9e25330b
commit db9e25330b
parent 97076ed46f
43 changed files with 0 additions and 43 deletions
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@ -381,4 +381,3 @@ sshd_sftp: false
 #
 # Autodetect python version
 #
-ansible_python_interpreter: auto
--- a/inventory/group_vars/arm_packager
+++ b/inventory/group_vars/arm_packager
@ -5,4 +5,3 @@ sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
 sudoers_main: nopasswd
 host_group: cloud
 ansible_ifcfg_blacklist: true 
-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/arm_qa
+++ b/inventory/group_vars/arm_qa
@ -6,4 +6,3 @@ sudoers_main: nopasswd
 libdir: /usr/lib
 host_group: cloud
 ansible_ifcfg_blacklist: true
-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/bastion_stg
+++ b/inventory/group_vars/bastion_stg
@ -48,4 +48,3 @@ nagios_Check_Services:
  mail: false

 # needed for rhel8
-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/bodhi_backend
+++ b/inventory/group_vars/bodhi_backend
@ -40,4 +40,3 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"

 ## XXX - note that the csi_ stuff is kept at the host_vars/ level.

-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/bodhi_backend_stg
+++ b/inventory/group_vars/bodhi_backend_stg
@ -28,7 +28,6 @@ bodhi_message_routing_keys:
 fas_client_groups: sysadmin-releng,sysadmin-bodhi
 sudoers: "{{ private }}/files/sudo/00releng-sudoers-bodhi-stg"

-ansible_python_interpreter: /usr/bin/python3

 # For the MOTD
 csi_security_category: Moderate
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@ -8,7 +8,6 @@ num_cpus: 5
 max_cpu: "{{ num_cpus }}"
 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-29-aarch64
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/aarch64/os/
-ansible_python_interpreter: "/usr/bin/python3"
 nm: 255.255.255.0
 gw: 10.5.129.254
 dns: 10.5.126.21
--- a/inventory/group_vars/buildvm_armv7
+++ b/inventory/group_vars/buildvm_armv7
@ -8,7 +8,6 @@ num_cpus: 5
 max_cpu: "{{ num_cpus }}"
 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-armv7
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/armhfp/os/
-ansible_python_interpreter: "/usr/bin/python3"
 nm: 255.255.255.0
 gw: 10.5.129.254
 dns: 10.5.126.21
--- a/inventory/group_vars/buildvm_s390x
+++ b/inventory/group_vars/buildvm_s390x
@ -24,7 +24,6 @@ koji_hub_nfs: "fedora_koji"
 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"

 csi_security_category: High
 csi_primary_contact: Fedora Admins - admin@fedoraproject.org
--- a/inventory/group_vars/copr_back
+++ b/inventory/group_vars/copr_back
@ -25,7 +25,6 @@ do_sign: "true"
 spawn_in_advance: "true"
 frontend_base_url: "https://copr.fedorainfracloud.org"

-ansible_python_interpreter: /usr/bin/python3

 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should override them with specific info.
--- a/inventory/group_vars/copr_back_dev
+++ b/inventory/group_vars/copr_back_dev
@ -22,7 +22,6 @@ do_sign: "true"
 spawn_in_advance: "false"
 frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"

-ansible_python_interpreter: /usr/bin/python3

 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should override them with specific info.
--- a/inventory/group_vars/copr_back_stg
+++ b/inventory/group_vars/copr_back_stg
@ -19,7 +19,6 @@ do_sign: "true"
 spawn_in_advance: "false"
 frontend_base_url: "https://copr.stg.fedoraproject.org"

-ansible_python_interpreter: /usr/bin/python3

 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should override them with specific info.
--- a/inventory/group_vars/oci_registry
+++ b/inventory/group_vars/oci_registry
@ -10,4 +10,3 @@ proxy_tcp_ports: [

 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"

-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/oci_registry_stg
+++ b/inventory/group_vars/oci_registry_stg
@ -9,4 +9,3 @@ proxy_tcp_ports: [

 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"

-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/group_vars/odcs_backend
+++ b/inventory/group_vars/odcs_backend
@ -32,7 +32,6 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '

 fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran

-ansible_python_interpreter: /usr/bin/python3

 fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"

--- a/inventory/group_vars/odcs_backend_stg
+++ b/inventory/group_vars/odcs_backend_stg
@ -41,7 +41,6 @@ odcs_allowed_source_types: ["tag", "module"]

 odcs_target_dir_url: https://odcs.stg.fedoraproject.org/composes

-ansible_python_interpreter: /usr/bin/python3

 # For the MOTD
 csi_security_category: Low
--- a/inventory/group_vars/odcs_frontend
+++ b/inventory/group_vars/odcs_frontend
@ -35,7 +35,6 @@ fedmsg_certs:
  can_send:
  - odcs.compose.state-changed

-ansible_python_interpreter: /usr/bin/python3

 odcs_target_dir_url: https://odcs.fedoraproject.org/composes
 # Give access to jscotka to be able to develop module testing integration
--- a/inventory/group_vars/odcs_frontend_stg
+++ b/inventory/group_vars/odcs_frontend_stg
@ -39,7 +39,6 @@ odcs_allowed_clients_users:

 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"

-ansible_python_interpreter: /usr/bin/python3

 # For the MOTD
 csi_security_category: Low
--- a/inventory/group_vars/openqa_common
+++ b/inventory/group_vars/openqa_common
@ -4,7 +4,6 @@
 # can be used for non-infra deployments.

 # These boxes are F30+, so we need Python 3 ansible
-ansible_python_interpreter: /usr/bin/python3

 openqa_static_uid: 601

--- a/inventory/group_vars/openqa_stg_workers
+++ b/inventory/group_vars/openqa_stg_workers
@ -12,7 +12,6 @@ openqa_env_suffix: .stg
 openqa_env: staging

 # These boxes are F30+, so we need Python 3 ansible
-ansible_python_interpreter: /usr/bin/python3

 deployment_type: stg
 freezes: false
--- a/inventory/group_vars/openqa_workers
+++ b/inventory/group_vars/openqa_workers
@ -12,7 +12,6 @@ openqa_env_suffix:
 openqa_env: production

 # These boxes are F30+, so we need Python 3 ansible
-ansible_python_interpreter: /usr/bin/python3

 deployment_type: prod
 freezes: false
--- a/inventory/group_vars/releng_compose
+++ b/inventory/group_vars/releng_compose
@ -31,7 +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:
--- a/inventory/group_vars/tang
+++ b/inventory/group_vars/tang
@ -21,4 +21,3 @@ num_cpus: 2
 tcp_ports: [80]

 fas_client_groups: sysadmin-main
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/group_vars/wiki
+++ b/inventory/group_vars/wiki
@ -41,4 +41,3 @@ csi_relationship: |
 - If the Apache processes stop on wiki01 and wiki02 the wiki will not display
 - The wiki also requires fas for log in purposes

-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/group_vars/wiki_stg
+++ b/inventory/group_vars/wiki_stg
@ -31,4 +31,3 @@ fedmsg_certs:

 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"

-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-01.stg.arm.fedoraproject.org
@ -10,4 +10,3 @@ eth0_ip: 10.5.129.233
 gw: 10.5.129.254
 main_bridge: br0
 virt_install_command: "{{ virt_install_command_armv7_one_nic_unsafe }}"
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/certgetter01.phx2.fedoraproject.org
+++ b/inventory/host_vars/certgetter01.phx2.fedoraproject.org
@ -11,4 +11,3 @@ eth0_ip: 10.5.126.237
 vmhost: virthost21.phx2.fedoraproject.org
 datacenter: phx2

-ansible_python_interpreter: /usr/bin/python3
--- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org
@ -33,4 +33,3 @@ copr_hostbase: copr-be-dev
 _copr_be_conf: copr-be.conf-dev

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org
@ -42,4 +42,3 @@ nagios_Check_Services:
  swap: false

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
@ -23,4 +23,3 @@ cloud_networks:
 copr_hostbase: copr-dist-git-dev

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-dist-git.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git.fedorainfracloud.org
@ -24,4 +24,3 @@ copr_hostbase: copr-dist-git
 host_backup_targets: ['/var/lib/dist-git/git', '/var/lib/dist-git/cache']

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
@ -22,4 +22,3 @@ cloud_networks:
 copr_hostbase: copr-fe-dev

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-fe.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-fe.cloud.fedoraproject.org
@ -41,4 +41,3 @@ sar_script_user: copr-fe
 sar_output_file: copr.json

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen-dev.cloud.fedoraproject.org
@ -22,4 +22,3 @@ cloud_networks:
 copr_hostbase: copr-keygen-dev

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
@ -31,4 +31,3 @@ nagios_Check_Services:
  swap: false

 # There is no python2 on F30
-ansible_python_interpreter: "/usr/bin/python3"
--- a/inventory/host_vars/dbgserver01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/dbgserver01.stg.phx2.fedoraproject.org
@ -23,4 +23,3 @@ virt_install_command: "{{ virt_install_command_two_nic }}"

 sudoers: "{{ private }}/files/sudo/dbgserver-sudoers"

-ansible_python_interpreter: "/usr/bin/python3"
--- 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
--- 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
--- a/inventory/host_vars/f31-test.fedorainfracloud.org
+++ b/inventory/host_vars/f31-test.fedorainfracloud.org
@ -11,7 +11,6 @@ inventory_instance_name: f31-test
 hostbase: f31-test
 public_ip: 209.132.184.156
 description: f31-test instance
-ansible_python_interpreter: /usr/bin/python3

 cloud_networks:
  # maintainertest-net
--- a/inventory/host_vars/grobisplitter01.phx2.fedoraproject.org
+++ b/inventory/host_vars/grobisplitter01.phx2.fedoraproject.org
@ -13,7 +13,6 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=4"
 ks_url:  http://10.5.126.23/repo/rhel/ks/kvm-fedora-30
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/30/Server/x86_64/os/
 # Do this because we are using py3 only
-ansible_python_interpreter: "/usr/bin/python3"

 datacenter: phx2
 eth0_ip: 10.5.125.3
--- a/inventory/host_vars/ppc64le-test.fedorainfracloud.org
+++ b/inventory/host_vars/ppc64le-test.fedorainfracloud.org
@ -11,7 +11,6 @@ inventory_instance_name: ppc64le-test
 hostbase: ppc64le-test
 public_ip: 209.132.184.213
 description: ppc64le-test instance
-ansible_python_interpreter: /usr/bin/python3

 cloud_networks:
  # maintainertest-net
--- 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
--- 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