Merge pull request #653 from hjensas/ml2-baremetal

uni01alpha + uni04delta-ipv6: Add ml2 baremetal

Configure neutron ml2MechanismDrivers to include ovn and baremetal for uni01alpha and uni04delta-ipv6. Added the field to service-values.yaml and kustomization to patch it in controlplane.
This ensures the ports created by ironic during inspect, clean and provision are bound without error.
JIRA: OSPRH-20084

Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

dt/uni01alpha/kustomization.yaml

@@ -400,6 +400,18 @@ replacements:
         options:
           create: true
 
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.neutron.ml2MechanismDrivers
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.neutron.template.ml2MechanismDrivers
+        options:
+          create: true
+
   - source:
       kind: ConfigMap
       name: network-values

dt/uni04delta-ipv6/kustomization.yaml

@@ -32,6 +32,18 @@ replacements:
         options:
           create: true
 
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.neutron.ml2MechanismDrivers
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.neutron.template.ml2MechanismDrivers
+        options:
+          create: true
+
   - source:
       kind: ConfigMap
       name: service-values

examples/dt/uni01alpha/control-plane/service-values.yaml

@@ -176,6 +176,9 @@ data:
       [ml2]
       type_drivers = geneve,vxlan,vlan,flat,local
       tenant_network_types = geneve,flat
+    ml2MechanismDrivers:
+      - ovn
+      - baremetal
 
   redis:
     enabled: true

examples/dt/uni04delta-ipv6/control-plane/service-values.yaml

@@ -109,6 +109,9 @@ data:
       tenant_network_types = vlan,flat
       [ml2_type_vlan]
       network_vlan_ranges = datacentre:1000:2000
+    ml2MechanismDrivers:
+      - ovn
+      - baremetal
 
   extraMounts:
     - name: v1