infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

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

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-06-11 15:22:09 -07:00
parent bf36ef0220
commit 7a82a5a7d5
49 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/aarch64_test
View file

@ -4,4 +4,4 @@ freezes: false
sudoers: "{{ private }}/files/sudo/arm-packager-sudoers" sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
sudoers_main: nopasswd sudoers_main: nopasswd
host_group: cloud host_group: cloud
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true

2
inventory/group_vars/all
View file

@ -72,7 +72,7 @@ eth1_ip: 10.10.10.10
br0_nm: 255.255.255.0 br0_nm: 255.255.255.0
br1_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) # 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 # List of interfaces to explicitly disable
ansible_ifcfg_disabled: [] ansible_ifcfg_disabled: []
# #

2
inventory/group_vars/armv7_test
View file

@ -4,4 +4,4 @@ freezes: false
sudoers: "{{ private }}/files/sudo/arm-packager-sudoers" sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
sudoers_main: nopasswd sudoers_main: nopasswd
host_group: cloud host_group: cloud
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true

2
inventory/group_vars/autosign
View file

@ -11,7 +11,7 @@ num_cpus: 2
# https://bugzilla.redhat.com/show_bug.cgi?id=1283364 # https://bugzilla.redhat.com/show_bug.cgi?id=1283364
custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT'] custom_rules: ['-A INPUT --proto tcp --sport 44334 --source 10.3.169.120 -j ACCEPT']
ansible_ifcfg_whitelist: ansible_ifcfg_allowlist:
- eth0 - eth0
- eth1 - eth1

2
inventory/group_vars/buildarm
View file

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

2
inventory/group_vars/buildarm_stg
View file

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

2
inventory/group_vars/buildvm_s390x
View file

@ -14,7 +14,7 @@ dns: 10.3.163.33
nm: 255.255.255.0 nm: 255.255.255.0
virt_install_command: "{{ virt_install_command_s390x_one_nic }}" virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
createrepo: False createrepo: False
host_group: kojibuilder_iad2 host_group: kojibuilder_iad2
fas_client_groups: sysadmin-releng fas_client_groups: sysadmin-releng

2
inventory/group_vars/buildvm_s390x_stg
View file

@ -1,5 +1,5 @@
--- ---
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
createrepo: False createrepo: False
host_group: kojibuilder_iad2 host_group: kojibuilder_iad2
fas_client_groups: sysadmin-releng fas_client_groups: sysadmin-releng

2
inventory/group_vars/cloud
View file

@ -4,4 +4,4 @@ nagios_Check_Services:
nrpe: false nrpe: false
swap: false swap: false
datacenter: cloud datacenter: cloud
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true

2
inventory/group_vars/cloud_aws
View file

@ -5,7 +5,7 @@
#ansible_become_method: sudo #ansible_become_method: sudo
# Disable ethX ifcfg, let amazon handle these via DHCP. # Disable ethX ifcfg, let amazon handle these via DHCP.
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
datacenter: aws datacenter: aws
nagios_Check_Services: nagios_Check_Services:

2
inventory/group_vars/copr
View file

@ -16,7 +16,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
frontend_base_url: "https://copr.fedorainfracloud.org" frontend_base_url: "https://copr.fedorainfracloud.org"
dist_git_base_url: "copr-dist-git.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 copr_aws_region: us-east-1

2
inventory/group_vars/copr_aws
View file

@ -16,7 +16,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
frontend_base_url: "https://copr.fedorainfracloud.org" frontend_base_url: "https://copr.fedorainfracloud.org"
dist_git_base_url: "copr-dist-git.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 copr_aws_region: us-east-1

2
inventory/group_vars/copr_dev
View file

@ -17,7 +17,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org" frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.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 copr_aws_region: us-east-1

2
inventory/group_vars/copr_dev_aws
View file

@ -17,7 +17,7 @@ postfix_maincf: "postfix/main.cf/main.cf.copr"
frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org" frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org"
dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.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 copr_aws_region: us-east-1

2
inventory/group_vars/copr_stg
View file

@ -12,4 +12,4 @@ backend_base_url: "https://copr-be-stg.fedorainfracloud.org"
frontend_base_url: "https://copr.stg.fedoraproject.org" frontend_base_url: "https://copr.stg.fedoraproject.org"
dist_git_base_url: "copr-dist-git-stg.fedorainfracloud.org" dist_git_base_url: "copr-dist-git-stg.fedorainfracloud.org"
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true

2
inventory/group_vars/download_rdu2
View file

@ -5,7 +5,7 @@ rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"
nrpe_procs_warn: 900 nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000
virt_install_command: "{{ virt_install_command_rhel6 }}" virt_install_command: "{{ virt_install_command_rhel6 }}"
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
# nfs mount options, overrides the all/default # nfs mount options, overrides the all/default
nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3" nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"

2
inventory/group_vars/maintainer_test
View file

@ -5,4 +5,4 @@ sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
sudoers_main: nopasswd sudoers_main: nopasswd
host_group: cloud host_group: cloud
datacenter: aws datacenter: aws
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true

2
inventory/group_vars/openstack_compute
View file

@ -2,5 +2,5 @@
host_group: openstack-compute host_group: openstack-compute
nrpe_procs_warn: 1100 nrpe_procs_warn: 1100
nrpe_procs_crit: 1200 nrpe_procs_crit: 1200
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
baseiptables: False baseiptables: False

2
inventory/group_vars/retrace
View file

@ -2,7 +2,7 @@
fas_client_groups: retrace fas_client_groups: retrace
freezes: false freezes: false
sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers" sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
tcp_ports: [ 80, 443 ] tcp_ports: [ 80, 443 ]

2
inventory/group_vars/sign_vault
View file

@ -2,7 +2,7 @@
freezes: true freezes: true
postfix_group: sign postfix_group: sign
host_group: sign host_group: sign
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
nagios_Check_Services: nagios_Check_Services:
mail: false mail: false
nrpe: false nrpe: false

2
inventory/host_vars/aarch64-c26n1-oqa.arm.fedoraproject.org
View file

@ -18,7 +18,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# the regular interfaces (which on this system is eth0 and eth1) for us, # 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 # disabling all but the one we want to use (eth0), and leave everything
# else alone. # else alone.
ansible_ifcfg_whitelist: ['eth0', 'eth1'] ansible_ifcfg_allowlist: ['eth0', 'eth1']
ansible_ifcfg_disabled: ['eth1'] ansible_ifcfg_disabled: ['eth1']
# 5 is pushing it a bit, but we need 5 simultaneous tap workers for # 5 is pushing it a bit, but we need 5 simultaneous tap workers for

2
inventory/host_vars/aarch64-c27n1-oqa.arm.fedoraproject.org
View file

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

2
inventory/host_vars/aarch64-c28n1-oqa.arm.fedoraproject.org
View file

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

2
inventory/host_vars/aarch64-c29n1-oqa.arm.fedoraproject.org
View file

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

2
inventory/host_vars/aarch64-c30n1-oqa.arm.fedoraproject.org
View file

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

2
inventory/host_vars/backup01.iad2.fedoraproject.org
View file

@ -4,6 +4,6 @@ nrpe_procs_crit: 1400
datacenter: iad2 datacenter: iad2
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
grokmirror_topdir: /fedora_backups/grokmirror grokmirror_topdir: /fedora_backups/grokmirror

2
inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
View file

@ -1,2 +1,2 @@
--- ---
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True

2
inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
View file

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

2
inventory/host_vars/copr-dist-git.aws.fedoraproject.org
View file

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

2
inventory/host_vars/copr-fe-dev.aws.fedoraproject.org
View file

@ -4,7 +4,7 @@ inventory_hostname: "copr-fe-dev.aws.fedoraproject.org"
inventory_instance_name: copr-fe-dev inventory_instance_name: copr-fe-dev
nm_controlled_resolv: True nm_controlled_resolv: True
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
swap_file_size_mb: 4096 swap_file_size_mb: 4096
swap_file_path: /swap swap_file_path: /swap

2
inventory/host_vars/copr-fe.aws.fedoraproject.org
View file

@ -4,7 +4,7 @@ inventory_hostname: "copr-fe.aws.fedoraproject.org"
inventory_instance_name: copr-fe inventory_instance_name: copr-fe
nm_controlled_resolv: True nm_controlled_resolv: True
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
swap_file_size_mb: 8192 swap_file_size_mb: 8192
swap_file_path: /swap swap_file_path: /swap

2
inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
View file

@ -6,7 +6,7 @@ datacenter: aws
inventory_hostname: "copr-keygen-dev.aws.fedoraproject.org" inventory_hostname: "copr-keygen-dev.aws.fedoraproject.org"
inventory_instance_name: copr-keygen-dev inventory_instance_name: copr-keygen-dev
nm_controlled_resolv: True nm_controlled_resolv: True
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
#instance_type: t3a.small #instance_type: t3a.small
#image: "{{ fedora31_x86_64 }}" #image: "{{ fedora31_x86_64 }}"

2
inventory/host_vars/copr-keygen.aws.fedoraproject.org
View file

@ -6,7 +6,7 @@ datacenter: aws
inventory_hostname: "copr-keygen.aws.fedoraproject.org" inventory_hostname: "copr-keygen.aws.fedoraproject.org"
inventory_instance_name: copr-keygen inventory_instance_name: copr-keygen
nm_controlled_resolv: True nm_controlled_resolv: True
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
db_backup_dir: ['/backup'] db_backup_dir: ['/backup']
#instance_type: t3a.small #instance_type: t3a.small

2
inventory/host_vars/iddev.fedorainfracloud.org
View file

@ -1,5 +1,5 @@
--- ---
ansible_ifcfg_blacklist: true ansible_ifcfg_blocklist: true
tcp_ports: [22, 80, 443] tcp_ports: [22, 80, 443]
datacenter: aws datacenter: aws

2
inventory/host_vars/kernel03.qa.fedoraproject.org
View file

@ -1,5 +1,5 @@
--- ---
ansible_ifcfg_whitelist: ['eth0'] ansible_ifcfg_allowlist: ['eth0']
nm: 255.255.255.0 nm: 255.255.255.0
gw: 10.5.124.254 gw: 10.5.124.254
dns: 10.5.126.21 dns: 10.5.126.21

2
inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
View file

@ -23,7 +23,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: eth1 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'] ansible_ifcfg_disabled: ['eth0', 'eth2']
# this is an IAD box, use IAD host # this is an IAD box, use IAD host

2
inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org
View file

@ -21,7 +21,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: eth1 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'] ansible_ifcfg_disabled: ['eth0', 'eth2']
# this is a powerful machine, can handle more openQA workers # this is a powerful machine, can handle more openQA workers

2
inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org
View file

@ -15,7 +15,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# we seem to have an eth2 plugged in that isn't configured here, # we seem to have an eth2 plugged in that isn't configured here,
# which breaks "copy ifcfg files - non virthost" role # 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 # we just want the eth1 (qa network) interface active
ansible_ifcfg_disabled: ['eth0'] ansible_ifcfg_disabled: ['eth0']

2
inventory/host_vars/openqa-aarch64-03.qa.fedoraproject.org
View file

@ -15,7 +15,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# we seem to have an eth2 plugged in that isn't configured here, # we seem to have an eth2 plugged in that isn't configured here,
# which breaks "copy ifcfg files - non virthost" role # 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 # we just want the eth1 (qa network) interface active
ansible_ifcfg_disabled: ['eth0'] ansible_ifcfg_disabled: ['eth0']

2
inventory/host_vars/openqa-ppc64le-01.qa.fedoraproject.org
View file

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

2
inventory/host_vars/openqa-ppc64le-02.qa.fedoraproject.org
View file

@ -21,7 +21,7 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: eth2 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'] ansible_ifcfg_disabled: ['eth0', 'eth1', 'eth3']
# this is a powerful machine, can handle more openQA workers # this is a powerful machine, can handle more openQA workers

2
inventory/host_vars/openqa-ppc64le-03.qa.fedoraproject.org
View file

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

2
inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
View file

@ -20,7 +20,7 @@ gw: 10.3.174.254
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: em1 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'] ansible_ifcfg_disabled: ['em2', 'em3', 'em4']
# Has a hardware RNG # Has a hardware RNG

2
inventory/host_vars/qa01.qa.fedoraproject.org
View file

@ -20,7 +20,7 @@ gw: 10.5.124.254
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: em3 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'] ansible_ifcfg_disabled: ['em1', 'em2', 'em4']
# Has a hardware RNG # Has a hardware RNG

2
inventory/host_vars/qa02.qa.fedoraproject.org
View file

@ -20,7 +20,7 @@ gw: 10.5.124.254
# else alone. We use a variable definition here so the firewall config # else alone. We use a variable definition here so the firewall config
# (in the openqa_tap_workers group_vars) can reuse it. # (in the openqa_tap_workers group_vars) can reuse it.
openqa_tap_iface: em3 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'] ansible_ifcfg_disabled: ['em1', 'em2', 'em4']
# Has a hardware RNG # Has a hardware RNG

2
inventory/host_vars/qa09.qa.fedoraproject.org
View file

@ -13,7 +13,7 @@ gw: 10.5.124.254
# the regular interfaces (which on this system is eth0 and eth1) for us, # 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 # disabling all but the one we want to use (eth0), and leave everything
# else alone. # else alone.
ansible_ifcfg_whitelist: ['eth0', 'eth1'] ansible_ifcfg_allowlist: ['eth0', 'eth1']
ansible_ifcfg_disabled: ['eth1'] ansible_ifcfg_disabled: ['eth1']
# this is a powerful machine, can handle more openQA workers # this is a powerful machine, can handle more openQA workers

2
inventory/host_vars/qa14.qa.fedoraproject.org
View file

@ -13,7 +13,7 @@ gw: 10.5.131.254
# the regular interfaces (which on this system is eth0 and eth1) for us, # 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 # disabling all but the one we want to use (eth0), and leave everything
# else alone. # else alone.
ansible_ifcfg_whitelist: ['eth0', 'eth1'] ansible_ifcfg_allowlist: ['eth0', 'eth1']
ansible_ifcfg_disabled: ['eth1'] ansible_ifcfg_disabled: ['eth1']
# this is a powerful machine, can handle more openQA workers # this is a powerful machine, can handle more openQA workers

2
inventory/host_vars/retrace-stg.aws.fedoraproject.org
View file

@ -3,7 +3,7 @@
#ansible_become_user: root #ansible_become_user: root
#ansible_become: yes #ansible_become: yes
nm_controlled_resolv: True nm_controlled_resolv: True
ansible_ifcfg_blacklist: True ansible_ifcfg_blocklist: True
public_ip: 3.228.218.234 public_ip: 3.228.218.234
datacenter: aws datacenter: aws

10
roles/base/tasks/main.yml
View file

@ -59,7 +59,7 @@
ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
notify: notify:
- restart NetworkManager - 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: tags:
- config - config
- resolvconf - resolvconf
@ -70,7 +70,7 @@
ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
notify: notify:
- restart NetworkManager - 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: tags:
- config - config
- resolvconf - resolvconf
@ -83,7 +83,7 @@
changed_when: false changed_when: false
failed_when: 'if_uuid.stdout == ""' failed_when: 'if_uuid.stdout == ""'
check_mode: no 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: tags:
- config - config
- ifcfg - ifcfg
@ -104,8 +104,8 @@
- hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] - hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active']
- ansible_distribution_major_version|int >=7 - ansible_distribution_major_version|int >=7
- nmclitest is success - nmclitest is success
- not ansible_ifcfg_blacklist - not ansible_ifcfg_blocklist
- ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist - ansible_ifcfg_allowlist is not defined or item in ansible_ifcfg_allowlist
tags: tags:
- config - config
- ifcfg - ifcfg