fix kustomization for octavia and ovn

Author: lmiccini

dt/dcn/control-plane/kustomization.yaml

@@ -69,7 +69,7 @@ replacements:
   - source:
       kind: ConfigMap
       name: service-values
-      fieldPath: data.ovn.ovnController.external-ids
+      fieldPath: data.ovn.template.ovnController.external-ids
     targets:
       - select:
           kind: OpenStackControlPlane
@@ -80,7 +80,7 @@ replacements:
   - source:
       kind: ConfigMap
       name: service-values
-      fieldPath: data.ovn.ovnController.nicMappings
+      fieldPath: data.ovn.template.ovnController.nicMappings
     targets:
       - select:
           kind: OpenStackControlPlane

examples/dt/dcn/control-plane/scaledown/service-values.yaml

@@ -198,48 +198,50 @@ data:
       physnets = datacentre,leaf1,leaf2
   octavia:
     enabled: true
-    amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
-    lbMgmtNetwork:
-      createDefaultLbMgmtNetwork: false
-      lbMgmtRouterGateway: 172.23.0.150
-      availabilityZones:
-        - az0
-    octaviaAPI:
-      networkAttachments:
-        - internalapi
-      customServiceConfig: |
-        [controller_worker]
-        loadbalancer_topology=ACTIVE_STANDBY
-    octaviaHousekeeping:
-      networkAttachments:
-        - octavia
-      customServiceConfig: |
-        [controller_worker]
-        loadbalancer_topology=ACTIVE_STANDBY
-    octaviaHealthManager:
-      networkAttachments:
-        - octavia
-      customServiceConfig: |
-        [controller_worker]
-        loadbalancer_topology=ACTIVE_STANDBY
-    octaviaWorker:
-      networkAttachments:
-        - octavia
-      customServiceConfig: |
-        [controller_worker]
-        loadbalancer_topology=ACTIVE_STANDBY
+    template:
+      amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
+      lbMgmtNetwork:
+        createDefaultLbMgmtNetwork: false
+        lbMgmtRouterGateway: 172.23.0.150
+        availabilityZones:
+          - az0
+      octaviaAPI:
+        networkAttachments:
+          - internalapi
+        customServiceConfig: |
+          [controller_worker]
+          loadbalancer_topology=ACTIVE_STANDBY
+      octaviaHousekeeping:
+        networkAttachments:
+          - octavia
+        customServiceConfig: |
+          [controller_worker]
+          loadbalancer_topology=ACTIVE_STANDBY
+      octaviaHealthManager:
+        networkAttachments:
+          - octavia
+        customServiceConfig: |
+          [controller_worker]
+          loadbalancer_topology=ACTIVE_STANDBY
+      octaviaWorker:
+        networkAttachments:
+          - octavia
+        customServiceConfig: |
+          [controller_worker]
+          loadbalancer_topology=ACTIVE_STANDBY
 
   ovn:
-    ovnController:
-      external-ids:
-        availability-zones: []
-        enable-chassis-as-gateway: true
-        ovn-bridge: br-int
-        ovn-encap-type: geneve
-        system-id: random
-      nicMappings:
-        datacentre: ocpbr
-        octavia: octbr
+    template:
+      ovnController:
+        external-ids:
+          availability-zones: []
+          enable-chassis-as-gateway: true
+          ovn-bridge: br-int
+          ovn-encap-type: geneve
+          system-id: random
+        nicMappings:
+          datacentre: ocpbr
+          octavia: octbr
   nova:
     customServiceConfig: |
       [DEFAULT]

examples/dt/dcn/service-values.yaml

@@ -271,36 +271,38 @@ data:
 
   octavia:
     enabled: true
-    amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
-    lbMgmtNetwork:
-      createDefaultLbMgmtNetwork: false
-      lbMgmtRouterGateway: 172.23.0.150
-      availabilityZones:
-        - az0
-    octaviaAPI:
-      networkAttachments:
-        - internalapi
-    octaviaHousekeeping:
-      networkAttachments:
-        - octavia
-    octaviaHealthManager:
-      networkAttachments:
-        - octavia
-    octaviaWorker:
-      networkAttachments:
-        - octavia
+    template:
+      amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
+      lbMgmtNetwork:
+        createDefaultLbMgmtNetwork: false
+        lbMgmtRouterGateway: 172.23.0.150
+        availabilityZones:
+          - az0
+      octaviaAPI:
+        networkAttachments:
+          - internalapi
+      octaviaHousekeeping:
+        networkAttachments:
+          - octavia
+      octaviaHealthManager:
+        networkAttachments:
+          - octavia
+      octaviaWorker:
+        networkAttachments:
+          - octavia
 
   ovn:
-    ovnController:
-      external-ids:
-        availability-zones: []
-        enable-chassis-as-gateway: true
-        ovn-bridge: br-int
-        ovn-encap-type: geneve
-        system-id: random
-      nicMappings:
-        datacentre: ocpbr
-        octavia: octbr
+    template:
+      ovnController:
+        external-ids:
+          availability-zones: []
+          enable-chassis-as-gateway: true
+          ovn-bridge: br-int
+          ovn-encap-type: geneve
+          system-id: random
+        nicMappings:
+          datacentre: ocpbr
+          octavia: octbr
   nova:
     customServiceConfig: |
       [DEFAULT]