Rename ansible_ifcfg_{black,white}list to {block,allow}list

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-06-11 15:22:09 -07:00 · 2020-06-11 15:22:09 -07:00 · 7a82a5a7d5
commit 7a82a5a7d5
parent bf36ef0220
49 changed files with 53 additions and 53 deletions
--- a/inventory/group_vars/aarch64_test
+++ b/inventory/group_vars/aarch64_test
@ -4,4 +4,4 @@ freezes: false
 sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
 sudoers_main: nopasswd
 host_group: cloud
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@ -72,7 +72,7 @@ eth1_ip: 10.10.10.10
 br0_nm: 255.255.255.0
 br1_nm: 255.255.255.0
 # Default to managing the network, we want to not do this on select hosts (like cloud nodes)
-ansible_ifcfg_blacklist: false
+ansible_ifcfg_blocklist: false
 # List of interfaces to explicitly disable
 ansible_ifcfg_disabled: []
 #
--- a/inventory/group_vars/armv7_test
+++ b/inventory/group_vars/armv7_test
@ -4,4 +4,4 @@ freezes: false
 sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
 sudoers_main: nopasswd
 host_group: cloud
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
--- a/inventory/group_vars/autosign
+++ b/inventory/group_vars/autosign
@ -11,7 +11,7 @@ num_cpus: 2
 # https://bugzilla.redhat.com/show_bug.cgi?id=1283364
 custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT']

-ansible_ifcfg_whitelist:
+ansible_ifcfg_allowlist:
 - eth0
 - eth1

--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@ -2,7 +2,7 @@
 host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_weburl: "https:/koji.fedoraproject.org/koji"
--- a/inventory/group_vars/buildarm_stg
+++ b/inventory/group_vars/buildarm_stg
@ -2,7 +2,7 @@
 host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 koji_server_url: "https://koji.stg.fedoraproject.org/kojihub"
 koji_weburl: "https:/koji.stg.fedoraproject.org/koji"
--- a/inventory/group_vars/buildvm_s390x
+++ b/inventory/group_vars/buildvm_s390x
@ -14,7 +14,7 @@ dns: 10.3.163.33
 nm: 255.255.255.0
 virt_install_command: "{{ virt_install_command_s390x_one_nic }}"

-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True
 createrepo: False
 host_group: kojibuilder_iad2
 fas_client_groups: sysadmin-releng
--- a/inventory/group_vars/buildvm_s390x_stg
+++ b/inventory/group_vars/buildvm_s390x_stg
@ -1,5 +1,5 @@
 ---
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True
 createrepo: False
 host_group: kojibuilder_iad2
 fas_client_groups: sysadmin-releng
--- a/inventory/group_vars/cloud
+++ b/inventory/group_vars/cloud
@ -4,4 +4,4 @@ nagios_Check_Services:
  nrpe: false
  swap: false
 datacenter: cloud
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
--- a/inventory/group_vars/cloud_aws
+++ b/inventory/group_vars/cloud_aws
@ -5,7 +5,7 @@
 #ansible_become_method: sudo

 # Disable ethX ifcfg, let amazon handle these via DHCP.
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 datacenter: aws
 nagios_Check_Services:
--- a/inventory/group_vars/copr
+++ b/inventory/group_vars/copr
@ -16,7 +16,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
 frontend_base_url: "https://copr.fedorainfracloud.org"
 dist_git_base_url: "copr-dist-git.fedorainfracloud.org"

-ansible_ifcfg_blacklist: true 
+ansible_ifcfg_blocklist: true 

 copr_aws_region: us-east-1

--- a/inventory/group_vars/copr_aws
+++ b/inventory/group_vars/copr_aws
@ -16,7 +16,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
 frontend_base_url: "https://copr.fedorainfracloud.org"
 dist_git_base_url: "copr-dist-git.fedorainfracloud.org"

-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 copr_aws_region: us-east-1

--- a/inventory/group_vars/copr_dev
+++ b/inventory/group_vars/copr_dev
@ -17,7 +17,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
 frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
 dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org"

-ansible_ifcfg_blacklist: true 
+ansible_ifcfg_blocklist: true 

 copr_aws_region: us-east-1

--- a/inventory/group_vars/copr_dev_aws
+++ b/inventory/group_vars/copr_dev_aws
@ -17,7 +17,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
 frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
 dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org"

-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 copr_aws_region: us-east-1

--- a/inventory/group_vars/copr_stg
+++ b/inventory/group_vars/copr_stg
@ -12,4 +12,4 @@ backend_base_url: "https://copr-be-stg.fedorainfracloud.org"
 frontend_base_url: "https://copr.stg.fedoraproject.org"
 dist_git_base_url: "copr-dist-git-stg.fedorainfracloud.org"

-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
--- a/inventory/group_vars/download_rdu2
+++ b/inventory/group_vars/download_rdu2
@ -5,7 +5,7 @@ rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
 virt_install_command: "{{ virt_install_command_rhel6 }}"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 # nfs mount options, overrides the all/default
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"
--- a/inventory/group_vars/maintainer_test
+++ b/inventory/group_vars/maintainer_test
@ -5,4 +5,4 @@ sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
 sudoers_main: nopasswd
 host_group: cloud
 datacenter: aws
-ansible_ifcfg_blacklist: true 
+ansible_ifcfg_blocklist: true 
--- a/inventory/group_vars/openstack_compute
+++ b/inventory/group_vars/openstack_compute
@ -2,5 +2,5 @@
 host_group: openstack-compute
 nrpe_procs_warn: 1100
 nrpe_procs_crit: 1200
-ansible_ifcfg_blacklist: true 
+ansible_ifcfg_blocklist: true 
 baseiptables: False
--- a/inventory/group_vars/retrace
+++ b/inventory/group_vars/retrace
@ -2,7 +2,7 @@
 fas_client_groups: retrace
 freezes: false
 sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 tcp_ports: [ 80, 443 ]

--- a/inventory/group_vars/sign_vault
+++ b/inventory/group_vars/sign_vault
@ -2,7 +2,7 @@
 freezes: true
 postfix_group: sign
 host_group: sign
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
 nagios_Check_Services:
  mail: false
  nrpe: false
--- a/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org
@ -18,7 +18,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # the regular interfaces (which on this system is eth0 and eth1) for us,
 # disabling all but the one we want to use (eth0), and leave everything
 # else alone.
-ansible_ifcfg_whitelist: ['eth0', 'eth1']
+ansible_ifcfg_allowlist: ['eth0', 'eth1']
 ansible_ifcfg_disabled: ['eth1']

 # 5 is pushing it a bit, but we need 5 simultaneous tap workers for
--- a/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org
@ -17,7 +17,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # handle the openvswitch config well. so let's tell it to just configure
 # the actual connected interface (which on this system is eth0) for us
 # and leave everything else alone.
-ansible_ifcfg_whitelist: ['eth0']
+ansible_ifcfg_allowlist: ['eth0']

 openqa_workers: 4
 # firewall ports for server->worker websockets connections
--- a/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org
@ -17,7 +17,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # handle the openvswitch config well. so let's tell it to just configure
 # the actual connected interface (which on this system is eth0) for us
 # and leave everything else alone.
-ansible_ifcfg_whitelist: ['eth0']
+ansible_ifcfg_allowlist: ['eth0']

 openqa_workers: 4
 # firewall ports for server->worker websockets connections
--- a/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org
@ -17,7 +17,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # handle the openvswitch config well. so let's tell it to just configure
 # the actual connected interface (which on this system is eth0) for us
 # and leave everything else alone.
-ansible_ifcfg_whitelist: ['eth0']
+ansible_ifcfg_allowlist: ['eth0']

 openqa_workers: 4
 # firewall ports for server->worker websockets connections
--- a/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org
+++ b/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org
@ -17,7 +17,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # handle the openvswitch config well. so let's tell it to just configure
 # the actual connected interface (which on this system is eth0) for us
 # and leave everything else alone.
-ansible_ifcfg_whitelist: ['eth0']
+ansible_ifcfg_allowlist: ['eth0']

 openqa_workers: 4
 # firewall ports for server->worker websockets connections
--- a/inventory/host_vars/backup01.iad2.fedoraproject.org
+++ b/inventory/host_vars/backup01.iad2.fedoraproject.org
@ -4,6 +4,6 @@ nrpe_procs_crit: 1400

 datacenter: iad2

-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true

 grokmirror_topdir: /fedora_backups/grokmirror
--- a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
@ -1,2 +1,2 @@
 ---
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True
--- a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
@ -6,7 +6,7 @@ datacenter: aws
 inventory_hostname: "copr-dist-git-dev.aws.fedoraproject.org"
 inventory_instance_name: copr-dist-git-dev
 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True

 swap_file_size_mb: 2048
 swap_file_path: /swap
--- a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
@ -6,7 +6,7 @@ datacenter: aws
 inventory_hostname: "copr-dist-git.aws.fedoraproject.org"
 inventory_instance_name: copr-dist-git
 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True

 #swap_file_size_mb: 2048
 #swap_file_path: /swap
--- a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org
@ -4,7 +4,7 @@ inventory_hostname: "copr-fe-dev.aws.fedoraproject.org"
 inventory_instance_name: copr-fe-dev

 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True

 swap_file_size_mb: 4096
 swap_file_path: /swap
--- a/inventory/host_vars/copr-fe.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-fe.aws.fedoraproject.org
@ -4,7 +4,7 @@ inventory_hostname: "copr-fe.aws.fedoraproject.org"
 inventory_instance_name: copr-fe

 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True

 swap_file_size_mb: 8192
 swap_file_path: /swap
--- a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
@ -6,7 +6,7 @@ datacenter: aws
 inventory_hostname: "copr-keygen-dev.aws.fedoraproject.org"
 inventory_instance_name: copr-keygen-dev
 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True

 #instance_type: t3a.small
 #image: "{{ fedora31_x86_64 }}"
--- a/inventory/host_vars/copr-keygen.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen.aws.fedoraproject.org
@ -6,7 +6,7 @@ datacenter: aws
 inventory_hostname: "copr-keygen.aws.fedoraproject.org"
 inventory_instance_name: copr-keygen
 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True
 db_backup_dir: ['/backup']

 #instance_type: t3a.small
--- a/inventory/host_vars/iddev.fedorainfracloud.org
+++ b/inventory/host_vars/iddev.fedorainfracloud.org
@ -1,5 +1,5 @@
 ---
-ansible_ifcfg_blacklist: true
+ansible_ifcfg_blocklist: true
 tcp_ports: [22, 80, 443]

 datacenter: aws
--- a/inventory/host_vars/kernel03.qa.fedoraproject.org
+++ b/inventory/host_vars/kernel03.qa.fedoraproject.org
@ -1,5 +1,5 @@
 ---
-ansible_ifcfg_whitelist: ['eth0']
+ansible_ifcfg_allowlist: ['eth0']
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
--- a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
@ -23,7 +23,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth1
-ansible_ifcfg_whitelist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
+ansible_ifcfg_allowlist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
 ansible_ifcfg_disabled: ['eth0', 'eth2']

 # this is an IAD box, use IAD host
--- a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org
@ -21,7 +21,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth1
-ansible_ifcfg_whitelist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
+ansible_ifcfg_allowlist: ['eth0', '{{ openqa_tap_iface }}', 'eth2']
 ansible_ifcfg_disabled: ['eth0', 'eth2']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org
@ -15,7 +15,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"

 # we seem to have an eth2 plugged in that isn't configured here,
 # which breaks "copy ifcfg files - non virthost" role
-ansible_ifcfg_whitelist: ['eth0', 'eth1']
+ansible_ifcfg_allowlist: ['eth0', 'eth1']
 # we just want the eth1 (qa network) interface active
 ansible_ifcfg_disabled: ['eth0']

--- a/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org
@ -15,7 +15,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"

 # we seem to have an eth2 plugged in that isn't configured here,
 # which breaks "copy ifcfg files - non virthost" role
-ansible_ifcfg_whitelist: ['eth0', 'eth1']
+ansible_ifcfg_allowlist: ['eth0', 'eth1']
 # we just want the eth1 (qa network) interface active
 ansible_ifcfg_disabled: ['eth0']

--- a/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org
@ -19,7 +19,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # the regular interfaces (which on this system is eth0-eth3) for us,
 # disabling all but the one we want to use (eth2), and leave everything
 # else alone.
-ansible_ifcfg_whitelist: ['eth0', 'eth1', 'eth2', 'eth3']
+ansible_ifcfg_allowlist: ['eth0', 'eth1', 'eth2', 'eth3']
 ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org
@ -21,7 +21,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: eth2
-ansible_ifcfg_whitelist: ['eth0', 'eth1', '{{ openqa_tap_iface }}', 'eth3']
+ansible_ifcfg_allowlist: ['eth0', 'eth1', '{{ openqa_tap_iface }}', 'eth3']
 ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org
+++ b/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org
@ -19,7 +19,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # the regular interfaces (which on this system is eth0-eth3) for us,
 # disabling all but the one we want to use (eth2), and leave everything
 # else alone.
-ansible_ifcfg_whitelist: ['eth0', 'eth1', 'eth2', 'eth3']
+ansible_ifcfg_allowlist: ['eth0', 'eth1', 'eth2', 'eth3']
 ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
@ -20,7 +20,7 @@ gw: 10.3.174.254
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: em1
-ansible_ifcfg_whitelist: ['{{ openqa_tap_iface }}', 'em2', 'em3', 'em4']
+ansible_ifcfg_allowlist: ['{{ openqa_tap_iface }}', 'em2', 'em3', 'em4']
 ansible_ifcfg_disabled: ['em2', 'em3', 'em4']

 # Has a hardware RNG
--- a/inventory/host_vars/qa01.qa.fedoraproject.org
+++ b/inventory/host_vars/qa01.qa.fedoraproject.org
@ -20,7 +20,7 @@ gw: 10.5.124.254
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: em3
-ansible_ifcfg_whitelist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4']
+ansible_ifcfg_allowlist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4']
 ansible_ifcfg_disabled: ['em1', 'em2', 'em4']

 # Has a hardware RNG
--- a/inventory/host_vars/qa02.qa.fedoraproject.org
+++ b/inventory/host_vars/qa02.qa.fedoraproject.org
@ -20,7 +20,7 @@ gw: 10.5.124.254
 # else alone. We use a variable definition here so the firewall config
 # (in the openqa_tap_workers group_vars) can reuse it.
 openqa_tap_iface: em3
-ansible_ifcfg_whitelist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4']
+ansible_ifcfg_allowlist: ['em1', 'em2', '{{ openqa_tap_iface }}', 'em4']
 ansible_ifcfg_disabled: ['em1', 'em2', 'em4']

 # Has a hardware RNG
--- a/inventory/host_vars/qa09.qa.fedoraproject.org
+++ b/inventory/host_vars/qa09.qa.fedoraproject.org
@ -13,7 +13,7 @@ gw: 10.5.124.254
 # the regular interfaces (which on this system is eth0 and eth1) for us,
 # disabling all but the one we want to use (eth0), and leave everything
 # else alone.
-ansible_ifcfg_whitelist: ['eth0', 'eth1']
+ansible_ifcfg_allowlist: ['eth0', 'eth1']
 ansible_ifcfg_disabled: ['eth1']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/qa14.qa.fedoraproject.org
+++ b/inventory/host_vars/qa14.qa.fedoraproject.org
@ -13,7 +13,7 @@ gw: 10.5.131.254
 # the regular interfaces (which on this system is eth0 and eth1) for us,
 # disabling all but the one we want to use (eth0), and leave everything
 # else alone.
-ansible_ifcfg_whitelist: ['eth0', 'eth1']
+ansible_ifcfg_allowlist: ['eth0', 'eth1']
 ansible_ifcfg_disabled: ['eth1']

 # this is a powerful machine, can handle more openQA workers
--- a/inventory/host_vars/retrace-stg.aws.fedoraproject.org
+++ b/inventory/host_vars/retrace-stg.aws.fedoraproject.org
@ -3,7 +3,7 @@
 #ansible_become_user: root
 #ansible_become: yes
 nm_controlled_resolv: True
-ansible_ifcfg_blacklist: True
+ansible_ifcfg_blocklist: True
 public_ip: 3.228.218.234
 datacenter: aws

--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@ -59,7 +59,7 @@
  ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
  notify:
  - restart NetworkManager
-  when: ansible_distribution_major_version|int >=7 and ansible_distribution == 'RedHat' and nmclitest is success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv
+  when: ansible_distribution_major_version|int >=7 and ansible_distribution == 'RedHat' and nmclitest is success and ( not ansible_ifcfg_blocklist) and not nm_controlled_resolv
  tags:
   - config
   - resolvconf
@ -70,7 +70,7 @@
  ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
  notify:
  - restart NetworkManager
-  when: ansible_distribution_major_version|int >=29 and ansible_distribution == 'Fedora' and nmclitest is success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv
+  when: ansible_distribution_major_version|int >=29 and ansible_distribution == 'Fedora' and nmclitest is success and ( not ansible_ifcfg_blocklist) and not nm_controlled_resolv
  tags:
   - config
   - resolvconf
@ -83,7 +83,7 @@
  changed_when: false
  failed_when: 'if_uuid.stdout == ""'
  check_mode: no
-  when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blacklist )
+  when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blocklist )
  tags:
   - config
   - ifcfg
@ -104,8 +104,8 @@
  - hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active']
  - ansible_distribution_major_version|int >=7
  - nmclitest is success
-  - not ansible_ifcfg_blacklist
-  - ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist
+  - not ansible_ifcfg_blocklist
+  - ansible_ifcfg_allowlist is not defined or item in ansible_ifcfg_allowlist
  tags:
   - config
   - ifcfg