Merge pull request #1289 from karelyatin/OSPCIX-1271

Allow to override bridge mappings based on roles

Author: openshift-merge-bot[bot]

tests/roles/dataplane_adoption/defaults/main.yaml

@@ -401,7 +401,7 @@ dataplane_cr: |
 
           # ovn-controller settings
           edpm_ovn_bridge_mappings: {{
-            edpm_ovn_bridge_mappings_nodeset|default(edpm_ovn_bridge_mappings)|default(
+            edpm_ovn_bridge_mappings_computes|default(edpm_ovn_bridge_mappings_nodeset)|default(edpm_ovn_bridge_mappings)|default(
                 ["datacentre:" + neutron_physical_bridge_name]
             )
             + (["provider2:br-vlan"] if bgp|bool else [])
@@ -540,7 +540,7 @@ networker_cr: |
           - openvswitch3.3
           # ovn-controller settings
           edpm_ovn_bridge_mappings: {{
-            edpm_ovn_bridge_mappings_nodeset|default(edpm_ovn_bridge_mappings)|default(
+            edpm_ovn_bridge_mappings_networker|default(edpm_ovn_bridge_mappings_nodeset)|default(edpm_ovn_bridge_mappings)|default(
                 ["datacentre:" + neutron_physical_bridge_name]
             )
             + (["provider2:br-vlan"] if bgp|bool else [])