openQA: rename openvswitch bridge device to avoid conflict
On the new rdu3 worker hosts, br0 already exists and is the main system 'interface' (it's a bridge on two bonded physical interfaces connected to different switches, to make networking upgrades easier). So we can't call our openvswitch bridge 'br0' any more. Let's try calling it 'openqabr0' and see if anything explodes. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
f29615eda4
commit
4dc01bc892
4 changed files with 11 additions and 11 deletions
|
@ -1,10 +1,10 @@
|
|||
# firewall rules to allow openQA openvswitch guests to communicate
|
||||
# uses interface definition from host vars
|
||||
custom_rules: ['-A FORWARD -i br0 -j ACCEPT', '-A FORWARD -m state -i {{ openqa_tap_iface }} -o br0 --state RELATED,ESTABLISHED -j ACCEPT', '-A INPUT -i br0 -j ACCEPT']
|
||||
custom_rules: ['-A FORWARD -i openqabr0 -j ACCEPT', '-A FORWARD -m state -i {{ openqa_tap_iface }} -o openqabr0 --state RELATED,ESTABLISHED -j ACCEPT', '-A INPUT -i openqabr0 -j ACCEPT']
|
||||
nft_custom_rules:
|
||||
- 'add rule ip filter FORWARD iifname "br0" counter accept'
|
||||
- 'add rule ip filter FORWARD iifname "{{ openqa_tap_iface }}" oifname "br0" ct state related,established counter accept'
|
||||
- 'add rule ip filter INPUT iifname "br0" counter accept'
|
||||
- 'add rule ip filter FORWARD iifname "openqabr0" counter accept'
|
||||
- 'add rule ip filter FORWARD iifname "{{ openqa_tap_iface }}" oifname "openqabr0" ct state related,established counter accept'
|
||||
- 'add rule ip filter INPUT iifname "openqabr0" counter accept'
|
||||
# for iptables rules...maybe other stuff in future? both staging
|
||||
# and prod workers are in this group
|
||||
host_group: openqa-tap-workers
|
||||
|
|
|
@ -24,23 +24,23 @@
|
|||
- name: Create openvswitch bridge
|
||||
community.general.nmcli:
|
||||
conn_name: ovs-br
|
||||
ifname: br0
|
||||
ifname: openqabr0
|
||||
type: ovs-bridge
|
||||
state: present
|
||||
|
||||
- name: Create openvswitch port for openvswitch bridge
|
||||
community.general.nmcli:
|
||||
conn_name: ovs-br-port
|
||||
ifname: br0
|
||||
master: br0
|
||||
ifname: openqabr0
|
||||
master: openqabr0
|
||||
type: ovs-port
|
||||
state: present
|
||||
|
||||
- name: Create openvswitch interface for openvswitch bridge
|
||||
community.general.nmcli:
|
||||
conn_name: ovs-br-if
|
||||
ifname: br0
|
||||
master: br0
|
||||
ifname: openqabr0
|
||||
master: openqabr0
|
||||
ip4: '172.16.2.2/15'
|
||||
type: ovs-interface
|
||||
state: present
|
||||
|
@ -49,7 +49,7 @@
|
|||
community.general.nmcli:
|
||||
conn_name: ovs-tap{{ item }}-port
|
||||
ifname: tap{{ item }}
|
||||
master: br0
|
||||
master: openqabr0
|
||||
type: ovs-port
|
||||
state: present
|
||||
with_sequence: start=0 end={{ openqa_workers | int }}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
DEVICETYPE='ovs'
|
||||
TYPE='OVSPort'
|
||||
OVS_BRIDGE='br0'
|
||||
OVS_BRIDGE='openqabr0'
|
||||
DEVICE='tap{{ item }}'
|
||||
ONBOOT='yes'
|
||||
BOOTPROTO='none'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue