Merge pull request #796 from hjensas/uni01alpha-bridge-mappings

Per-role NeutronBridgeMappings - uni01alpha scenario
openstack-k8s-operators · Feb 5, 2025 · d2528a2 · d2528a2
2 parents 9584e64 + 9a7f89c
commit d2528a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/scenarios/uni01alpha/config_download.yaml b/scenarios/uni01alpha/config_download.yaml
@@ -83,10 +83,17 @@ parameter_defaults:
         ip_version: 4
   NeutronFlatNetworks:
     - datacentre
-    - baremetal
-  NeutronBridgeMappings:
-    - datacentre:br-ex
-    - baremetal:br-baremetal
+    - ironic
+  ControllerParameters:
+    NeutronBridgeMappings:
+      - datacentre:br-ex
+      - ironic:br-baremetal
+  NetworkerParameters:
+    NeutronBridgeMappings:
+      - datacentre:br-ex
+  ComputeParameters:
+    NeutronBridgeMappings:
+      - datacentre:br-ex
   IronicInspectorInterface: br-baremetal
   # Since we need predictable node names to be able to set this paremeter,
   # it a requirement to set the ci-framework parameter cifmw_run_id with

diff --git a/tests/roles/ovn_adoption/defaults/main.yaml b/tests/roles/ovn_adoption/defaults/main.yaml
@@ -34,7 +34,7 @@ ovn_nic_mapping_patch: |
       template:
         ovnController:
           nicMappings:
-            baremetal: baremetal
+            ironic: baremetal
 
 dpa_dir: "../.."
 dpa_tests_dir: "{{ dpa_dir }}/tests"