Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openqa: tweak qa01 ethernet config stuff a bit

Browse source 
Also, allow interface names starting with 'em' in the base
network stuff.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-12-14 19:05:20 -08:00
parent 6cce2ba3fb
commit a3f2af5a8c
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,9 +11,11 @@ gw: 10.5.124.254
# openQA tap worker hosts (like this one) do stuff with ifcfg that base
# doesn't understand. terrible, terrible stuff. seriously - it doesn't
# 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: ['em3']
# the regular interfaces (which on this system is em1-4) for us,
# disabling all but the one we want to use (em3), and leave everything
# else alone.
ansible_ifcfg_whitelist: ['em1', 'em2', 'em3', 'em4']
ansible_ifcfg_disabled: ['em1', 'em2', 'em4']
# this is a powerful machine, can handle more openQA workers
openqa_workers: 30

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

@ -79,7 +79,7 @@
# - restart NetworkManager
- reload NetworkManager-connections
- apply interface-changes
when: (virthost is not defined) and (item.startswith(('eth','br','enc'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest is success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
when: (virthost is not defined) and (item.startswith(('eth','br','enc','em'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest is success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
tags:
- config
- ifcfg