Skip to content

Commit 45807c6

Browse files
committed
Allow to override bridge mappings based on roles
Currently it was not possible to override this without full nodeset CR override, added neworker/compute specific vars to override based on roles. Related-Issue: #OSPCIX-1271 Signed-off-by: Yatin Karel <ykarel@redhat.com>
1 parent f93e14d commit 45807c6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • tests/roles/dataplane_adoption/defaults

tests/roles/dataplane_adoption/defaults/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ dataplane_cr: |
396396
397397
# ovn-controller settings
398398
edpm_ovn_bridge_mappings: {{
399-
edpm_ovn_bridge_mappings_nodeset|default(edpm_ovn_bridge_mappings)|default(
399+
edpm_ovn_bridge_mappings_computes|default(edpm_ovn_bridge_mappings_nodeset)|default(edpm_ovn_bridge_mappings)|default(
400400
["datacentre:" + neutron_physical_bridge_name]
401401
)
402402
+ (["provider2:br-vlan"] if bgp|bool else [])
@@ -535,7 +535,7 @@ networker_cr: |
535535
- openvswitch3.3
536536
# ovn-controller settings
537537
edpm_ovn_bridge_mappings: {{
538-
edpm_ovn_bridge_mappings_nodeset|default(edpm_ovn_bridge_mappings)|default(
538+
edpm_ovn_bridge_mappings_networker|default(edpm_ovn_bridge_mappings_nodeset)|default(edpm_ovn_bridge_mappings)|default(
539539
["datacentre:" + neutron_physical_bridge_name]
540540
)
541541
+ (["provider2:br-vlan"] if bgp|bool else [])

0 commit comments

Comments
 (0)