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

Make ifcfg change for openqa-ppc64le as well, and drop hack

Browse source 
Hopefully this bit in tap-setup.yml can now go away, as this
approach of using ansible_ifcfg_whitelist and _disabled does the
same thing in a cleaner way.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-12-15 10:06:54 -08:00
parent 8f652a3d20
commit 5a902d0cca
2 changed files with 6 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ eth2_nm: 255.255.255.0
gw: 10.5.131.254 gw: 10.5.131.254
dns: 10.5.126.21 dns: 10.5.126.21
eth2_ip: 10.5.131.73 eth2_ip: 10.5.131.73
eth2_nm: 255.255.255.0
datacenter: phx2 datacenter: phx2
fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran
nrpe_procs_warn: 250 nrpe_procs_warn: 250
@ -14,9 +15,11 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# openQA tap worker hosts (like this one) do stuff with ifcfg that base # openQA tap worker hosts (like this one) do stuff with ifcfg that base
# doesn't understand. terrible, terrible stuff. seriously - it doesn't # doesn't understand. terrible, terrible stuff. seriously - it doesn't
# 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 eth2) for us # the regular interfaces (which on this system is eth0-eth3) for us,
# and leave everything else alone. # disabling all but the one we want to use (eth2), and leave everything
ansible_ifcfg_whitelist: ['eth2'] # else alone.
ansible_ifcfg_whitelist: ['eth0', 'eth1', 'eth2', '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
openqa_workers: 8 openqa_workers: 8

26
roles/openqa/worker/tasks/tap-setup.yml
View file

@ -16,32 +16,6 @@
- name: Enable ipv4_forward in sysctl - name: Enable ipv4_forward in sysctl
sysctl: name=net.ipv4.ip_forward value=1 state=present sysctl_set=yes reload=yes sysctl: name=net.ipv4.ip_forward value=1 state=present sysctl_set=yes reload=yes
# this is Fedora infra-only stuff to stop network.service choking on
# dumb ifcfg stuff
- name: Check if there's an annoying ifcfg-usb0 lurking
stat: path=/etc/sysconfig/network-scripts/ifcfg-usb0
register: ifcfgusb0
failed_when: "1 != 1"
changed_when: "1 != 1"
check_mode: no
when: deployment_type is defined
- name: Check if there's an annoying ifcfg-eth1 lurking
stat: path=/etc/sysconfig/network-scripts/ifcfg-eth1
register: ifcfgeth1
failed_when: "1 != 1"
changed_when: "1 != 1"
check_mode: no
when: deployment_type is defined
- name: Make sure usb0 doesn't get in our way
lineinfile: dest=/etc/sysconfig/network-scripts/ifcfg-usb0 regexp="^ONBOOT=" line="ONBOOT=no"
when: (ifcfgusb0.stat.exists is defined) and (ifcfgusb0.stat.exists == True) and (deployment_type is defined)
- name: Make sure eth1 doesn't get in our way
lineinfile: dest=/etc/sysconfig/network-scripts/ifcfg-eth1 regexp="^ONBOOT=" line="ONBOOT=no"
when: (ifcfgeth1.stat.exists is defined) and (ifcfgeth1.stat.exists == True) and (deployment_type is defined)
- name: Start openvswitch service - name: Start openvswitch service
service: name=openvswitch enabled=yes state=started service: name=openvswitch enabled=yes state=started
with_sequence: "count={{ openqa_workers }}" with_sequence: "count={{ openqa_workers }}"