maybe this will make qa02 easier?

This commit is contained in:
Stephen Smoogen 2018-12-15 01:14:59 +00:00
parent 00ab5cce90
commit cc16f56e4f
4 changed files with 28 additions and 29 deletions

View file

@ -2,35 +2,25 @@
freezes: false freezes: false
fas_client_groups: sysadmin-qa,sysadmin-main fas_client_groups: sysadmin-qa,sysadmin-main
sudoers: "{{ private }}/files/sudo/qavirt-sudoers" sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
datacenter: phx2
# hardware and setup information nrpe_procs_warn: 1400
eth0_ip: 10.5.124.152 nrpe_procs_crit: 1600
eth0_nm: 255.255.255.128 em3_ip: 10.5.124.152
eth0_mac: 00:21:5e:c6:cc:9c gw: 10.5.124.254
eth_interface: eth0
volgroup: vmstore
# beaker clients hosted on this machine # openQA tap worker hosts (like this one) do stuff with ifcfg that base
clients: # doesn't understand. terrible, terrible stuff. seriously - it doesn't
- hostname: beaker-client10.qa.fedoraproject.org # handle the openvswitch config well. so let's tell it to just configure
macaddress: "52:54:00:a2:de:30" # the actual connected interface (which on this system is eth0) for us
memsize: 4096 # and leave everything else alone.
num_cpus: 2 ansible_ifcfg_whitelist: ['em3']
lvm_size: 20G
- hostname: beaker-client11.qa.fedoraproject.org # this is a powerful machine, can handle more openQA workers
macaddress: "52:54:00:fe:22:ff" openqa_workers: 10
memsize: 4096 # firewall ports for server->worker websockets connections
num_cpus: 2 # this port is 'QEMUPORT plus 1'
lvm_size: 20G # QEMUPORT is:
- hostname: beaker-client12.qa.fedoraproject.org # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
macaddress: "52:54:00:c5:04:14" # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
memsize: 4096 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103']
num_cpus: 2
lvm_size: 20G
- hostname: beaker-client13.qa.fedoraproject.org
macaddress: "52:54:00:b5:97:30"
memsize: 4096
num_cpus: 2
lvm_size: 20G

View file

@ -593,6 +593,7 @@ odcs-backend
openqa01.qa.fedoraproject.org openqa01.qa.fedoraproject.org
[openqa-workers] [openqa-workers]
qa02.qa.fedoraproject.org
qa05.qa.fedoraproject.org qa05.qa.fedoraproject.org
qa14.qa.fedoraproject.org qa14.qa.fedoraproject.org
@ -616,6 +617,7 @@ aarch64-c30n1-oqa.arm.fedoraproject.org
# the workers that can run networked jobs. each server should have *one* of these per arch # the workers that can run networked jobs. each server should have *one* of these per arch
[openqa-tap-workers] [openqa-tap-workers]
qa01.qa.fedoraproject.org qa01.qa.fedoraproject.org
qa02.qa.fedoraproject.org
qa14.qa.fedoraproject.org qa14.qa.fedoraproject.org
qa09.qa.fedoraproject.org qa09.qa.fedoraproject.org
openqa-ppc64le-01.qa.fedoraproject.org openqa-ppc64le-01.qa.fedoraproject.org

View file

@ -44,6 +44,8 @@
{% for host in groups['staging']|sort %} {% for host in groups['staging']|sort %}
{% if 'eth0_ip' in hostvars[host] %}# {{ host }} {% if 'eth0_ip' in hostvars[host] %}# {{ host }}
-A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited
{% elif 'em3_ip' in hostvars[host] %}# {{ host }}
-A INPUT -s {{ hostvars[host]['em3_ip'] }} -j REJECT --reject-with icmp-host-prohibited
{% else %}# {{ host }} has no 'eth0_ip' listed {% else %}# {{ host }} has no 'eth0_ip' listed
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -78,6 +80,8 @@
{% for host in groups['qa-isolated']|sort %} {% for host in groups['qa-isolated']|sort %}
{% if 'eth0_ip' in hostvars[host] %}# {{ host }} {% if 'eth0_ip' in hostvars[host] %}# {{ host }}
-A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited
{% elif 'em3_ip' in hostvars[host] %}# {{ host }}
-A INPUT -s {{ hostvars[host]['em3_ip'] }} -j REJECT --reject-with icmp-host-prohibited
{% else %}# {{ host }} has no 'eth0_ip' listed {% else %}# {{ host }} has no 'eth0_ip' listed
{% endif %} {% endif %}
{% endfor %} {% endfor %}
@ -121,5 +125,6 @@ COMMIT
# eth0 is the active interface on the x86_64 tap worker hosts, # eth0 is the active interface on the x86_64 tap worker hosts,
# eth2 is the active interface on the ppc64 tap worker host # eth2 is the active interface on the ppc64 tap worker host
-A POSTROUTING -o eth0 -j MASQUERADE -A POSTROUTING -o eth0 -j MASQUERADE
-A POSTROUTING -o em3 -j MASQUERADE
-A POSTROUTING -o eth2 -j MASQUERADE -A POSTROUTING -o eth2 -j MASQUERADE
COMMIT COMMIT

View file

@ -14,6 +14,8 @@ define host {
{% endif %} {% endif %}
{% if hostvars[host].eth0_ip is defined %} {% if hostvars[host].eth0_ip is defined %}
address {{ hostvars[host].eth0_ip }} address {{ hostvars[host].eth0_ip }}
{% elif hostvars[host].em3_ip is defined %}
address {{ hostvars[host].em3_ip }}
{% elif hostvars[host].ansible_default_ipv4 is defined %} {% elif hostvars[host].ansible_default_ipv4 is defined %}
{% if hostvars[host].ansible_default_ipv4.address is defined %} {% if hostvars[host].ansible_default_ipv4.address is defined %}
address {{ hostvars[host].ansible_default_ipv4.address }} address {{ hostvars[host].ansible_default_ipv4.address }}