diff --git a/inventory/group_vars/aarch64_test b/inventory/group_vars/aarch64_test index 40cf6f9569..56f179b7d2 100644 --- 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 diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 2e31d8036e..2506161381 100644 --- 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: [] # diff --git a/inventory/group_vars/armv7_test b/inventory/group_vars/armv7_test index 40cf6f9569..56f179b7d2 100644 --- 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 diff --git a/inventory/group_vars/autosign b/inventory/group_vars/autosign index 0e148742c6..2ec804471d 100644 --- 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 diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm index 90cca8227c..d1508a225a 100644 --- 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" diff --git a/inventory/group_vars/buildarm_stg b/inventory/group_vars/buildarm_stg index e23f562fab..ead40772c4 100644 --- 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" diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x index 0294644e26..96983c5a11 100644 --- 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 diff --git a/inventory/group_vars/buildvm_s390x_stg b/inventory/group_vars/buildvm_s390x_stg index 3a64fddf68..2b1fe6deb4 100644 --- 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 diff --git a/inventory/group_vars/cloud b/inventory/group_vars/cloud index 705a2186e4..a81885c273 100644 --- 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 diff --git a/inventory/group_vars/cloud_aws b/inventory/group_vars/cloud_aws index fc96e93645..d4533f8cbd 100644 --- 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: diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index 4a0de16984..e5449a0d37 100644 --- 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 diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index fc8bff9d87..c86e657450 100644 --- 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 diff --git a/inventory/group_vars/copr_dev b/inventory/group_vars/copr_dev index 63bb8aebe7..017d960fe4 100644 --- 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 diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 37053a1357..618b2da00c 100644 --- 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 diff --git a/inventory/group_vars/copr_stg b/inventory/group_vars/copr_stg index 6dccbfe094..bbe08821ea 100644 --- 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 diff --git a/inventory/group_vars/download_rdu2 b/inventory/group_vars/download_rdu2 index 81bf91b376..3202e39d6c 100644 --- 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" diff --git a/inventory/group_vars/maintainer_test b/inventory/group_vars/maintainer_test index 287a56c881..fb93879513 100644 --- 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 diff --git a/inventory/group_vars/openstack_compute b/inventory/group_vars/openstack_compute index 0fed5183fd..bebdfeec7e 100644 --- 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 diff --git a/inventory/group_vars/retrace b/inventory/group_vars/retrace index e0931528c2..785f390cbb 100644 --- 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 ] diff --git a/inventory/group_vars/sign_vault b/inventory/group_vars/sign_vault index 6ca3adcbd3..b08eb6cbfb 100644 --- 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 diff --git a/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org index bdd48a30a5..5ec2398ed3 100644 --- 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 diff --git a/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org index b2c50f48b8..4109415bda 100644 --- 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 diff --git a/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org index 2eeea12111..770b88a99d 100644 --- 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 diff --git a/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org index de56fdbcd1..4b5dc326ce 100644 --- 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 diff --git a/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org b/inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org index 5fad61f820..a0eeaa4474 100644 --- 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 diff --git a/inventory/host_vars/backup01.iad2.fedoraproject.org b/inventory/host_vars/backup01.iad2.fedoraproject.org index 70a3618395..9526cd715b 100644 --- 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 diff --git a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org index aa88b3cebd..f7648aeb9d 100644 --- 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 diff --git a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org index ab740eeb35..084edb8b41 100644 --- 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 diff --git a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org index 8051acc6e5..3fca73393e 100644 --- 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 diff --git a/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org b/inventory/host_vars/copr-fe-dev.aws.fedoraproject.org index 84f0cce9ba..85dd16ddd0 100644 --- 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 diff --git a/inventory/host_vars/copr-fe.aws.fedoraproject.org b/inventory/host_vars/copr-fe.aws.fedoraproject.org index af2525f613..e0e075ca0b 100644 --- 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 diff --git a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org index ed89ecd921..2b529e8ce0 100644 --- 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 }}" diff --git a/inventory/host_vars/copr-keygen.aws.fedoraproject.org b/inventory/host_vars/copr-keygen.aws.fedoraproject.org index 431f14b9f8..d6418d7152 100644 --- 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 diff --git a/inventory/host_vars/iddev.fedorainfracloud.org b/inventory/host_vars/iddev.fedorainfracloud.org index 0eaeedbabf..9850d955d8 100644 --- 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 diff --git a/inventory/host_vars/kernel03.qa.fedoraproject.org b/inventory/host_vars/kernel03.qa.fedoraproject.org index 85ecc9279e..e6c850b644 100644 --- 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 diff --git a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org index 0b22bab731..6d04bec351 100644 --- 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 diff --git a/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org index 534887ba08..dfd879acff 100644 --- 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 diff --git a/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org index 976713f10b..e5beb184e2 100644 --- 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'] diff --git a/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org b/inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org index 4936160584..76c980dfc9 100644 --- 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'] diff --git a/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org index 1b545a4b07..f8b21ebabd 100644 --- 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 diff --git a/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org index b24c1ca850..aa4a615a68 100644 --- 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 diff --git a/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org b/inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org index 743ca85465..a8753d5e84 100644 --- 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 diff --git a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org index 309e4b2f3f..b80e84c6ac 100644 --- 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 diff --git a/inventory/host_vars/qa01.qa.fedoraproject.org b/inventory/host_vars/qa01.qa.fedoraproject.org index 001ec0d6b3..295e37af12 100644 --- 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 diff --git a/inventory/host_vars/qa02.qa.fedoraproject.org b/inventory/host_vars/qa02.qa.fedoraproject.org index a6dfc81bcc..f6d90663e0 100644 --- 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 diff --git a/inventory/host_vars/qa09.qa.fedoraproject.org b/inventory/host_vars/qa09.qa.fedoraproject.org index e5a829e5be..7a8fdd97e0 100644 --- 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 diff --git a/inventory/host_vars/qa14.qa.fedoraproject.org b/inventory/host_vars/qa14.qa.fedoraproject.org index 8307a76116..793b209904 100644 --- 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 diff --git a/inventory/host_vars/retrace-stg.aws.fedoraproject.org b/inventory/host_vars/retrace-stg.aws.fedoraproject.org index 0d66793ee0..52fa0998d9 100644 --- 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 diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 17d2a11aed..6d4f7fb834 100644 --- 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