Skip to content

Commit b6477ae

Browse files
Merge pull request #747 from renjingxiao/remove_ovn-egress-iface
Remove ovn-egress-iface workaround from br-ex members The ovs_extra setting for ovn-egress-iface=true is no longer needed since the OVN fix is included in ovn24.03-24.03.6-7 and later. Related-to: OSPRH-29272 Reviewed-by: Yatin Karel <ykarel@redhat.com> Reviewed-by: John Fulton <johfulto@redhat.com> Reviewed-by: sauragar Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
2 parents 18ee9c6 + 76e29b0 commit b6477ae

13 files changed

Lines changed: 0 additions & 52 deletions

File tree

examples/dt/uni01alpha/edpm/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ data:
4949
name: nic2
5050
mtu: {{ min_viable_mtu }}
5151
primary: true
52-
# this ovs_extra configuration fixes OSPRH-17551, but it will
53-
# be not needed when FDP-1472 is resolved
54-
ovs_extra:
55-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5652
{% for network in nodeset_networks %}
5753
- type: vlan
5854
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni01alpha/networker/nodeset/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ data:
6565
mtu: {{ min_viable_mtu }}
6666
# force the MAC address of the bridge to this interface
6767
primary: true
68-
# this ovs_extra configuration fixes OSPRH-17551, but it will
69-
# be not needed when FDP-1472 is resolved
70-
ovs_extra:
71-
- "set interface eth1 external-ids:ovn-egress-iface=true"
7268
{% for network in nodeset_networks %}
7369
- type: vlan
7470
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni02beta/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ data:
4949
name: nic2
5050
mtu: {{ min_viable_mtu }}
5151
primary: true
52-
# this ovs_extra configuration fixes OSPRH-17551, but it will
53-
# be not needed when FDP-1472 is resolved
54-
ovs_extra:
55-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5652
{% for network in nodeset_networks %}
5753
- type: vlan
5854
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni04delta-ipv6/edpm-pre-ceph/nodeset/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ data:
5151
mtu: {{ min_viable_mtu }}
5252
# force the MAC address of the bridge to this interface
5353
primary: true
54-
# this ovs_extra configuration fixes OSPRH-17551, but it will
55-
# be not needed when FDP-1472 is resolved
56-
ovs_extra:
57-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5854
{% for network in nodeset_networks %}
5955
- type: vlan
6056
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni04delta-ipv6/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ data:
5959
name: nic2
6060
mtu: {{ min_viable_mtu }}
6161
primary: true
62-
# this ovs_extra configuration fixes OSPRH-17551, but it will
63-
# be not needed when FDP-1472 is resolved
64-
ovs_extra:
65-
- "set interface eth1 external-ids:ovn-egress-iface=true"
6662
{% for network in nodeset_networks %}
6763
- type: vlan
6864
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni04delta/edpm-pre-ceph/nodeset/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ data:
5151
mtu: {{ min_viable_mtu }}
5252
# force the MAC address of the bridge to this interface
5353
primary: true
54-
# this ovs_extra configuration fixes OSPRH-17551, but it will
55-
# be not needed when FDP-1472 is resolved
56-
ovs_extra:
57-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5854
{% for network in nodeset_networks %}
5955
- type: vlan
6056
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni04delta/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ data:
5959
name: nic2
6060
mtu: {{ min_viable_mtu }}
6161
primary: true
62-
# this ovs_extra configuration fixes OSPRH-17551, but it will
63-
# be not needed when FDP-1472 is resolved
64-
ovs_extra:
65-
- "set interface eth1 external-ids:ovn-egress-iface=true"
6662
{% for network in nodeset_networks %}
6763
- type: vlan
6864
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni05epsilon/edpm-pre-ceph/nodeset/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ data:
5050
mtu: {{ min_viable_mtu }}
5151
# force the MAC address of the bridge to this interface
5252
primary: true
53-
# this ovs_extra configuration fixes OSPRH-17551, but it will
54-
# be not needed when FDP-1472 is resolved
55-
ovs_extra:
56-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5753
{% for network in nodeset_networks %}
5854
- type: vlan
5955
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni05epsilon/nodeset2/edpm-pre-ceph/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ data:
5050
mtu: {{ min_viable_mtu }}
5151
# force the MAC address of the bridge to this interface
5252
primary: true
53-
# this ovs_extra configuration fixes OSPRH-17551, but it will
54-
# be not needed when FDP-1472 is resolved
55-
ovs_extra:
56-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5753
{% for network in nodeset_networks %}
5854
- type: vlan
5955
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

examples/dt/uni06zeta/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ data:
4949
name: nic2
5050
mtu: {{ min_viable_mtu }}
5151
primary: true
52-
# this ovs_extra configuration fixes OSPRH-17551, but it will
53-
# be not needed when FDP-1472 is resolved
54-
ovs_extra:
55-
- "set interface eth1 external-ids:ovn-egress-iface=true"
5652
{% for network in nodeset_networks %}
5753
- type: vlan
5854
mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}

0 commit comments

Comments
 (0)