Merge pull request #58 from abays/fix_glance_override

Fix Glance internal service network override
openstack-k8s-operators · Dec 20, 2023 · 565e071 · 565e071
2 parents a5929e9 + 94a25e0
commit 565e071
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/va/hci/stage4/openstackcontrolplane.yaml b/va/hci/stage4/openstackcontrolplane.yaml
@@ -83,13 +83,14 @@ spec:
             - storage
           override:
             service:
-              metadata:
-                annotations:
-                  metallb.universe.tf/address-pool: internalapi
-                  metallb.universe.tf/allow-shared-ip: internalapi
-                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
-              spec:
-                type: LoadBalancer
+              internal:
+                metadata:
+                  annotations:
+                    metallb.universe.tf/address-pool: internalapi
+                    metallb.universe.tf/allow-shared-ip: internalapi
+                    metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+                spec:
+                  type: LoadBalancer
       storageClass: ""
       storageRequest: 10G
   heat:

diff --git a/va/hci/stage6/openstackcontrolplane.yaml b/va/hci/stage6/openstackcontrolplane.yaml
@@ -101,13 +101,14 @@ spec:
             - storage
           override:
             service:
-              metadata:
-                annotations:
-                  metallb.universe.tf/address-pool: internalapi
-                  metallb.universe.tf/allow-shared-ip: internalapi
-                  metallb.universe.tf/loadBalancerIPs: 172.17.0.80
-              spec:
-                type: LoadBalancer
+              internal:
+                metadata:
+                  annotations:
+                    metallb.universe.tf/address-pool: internalapi
+                    metallb.universe.tf/allow-shared-ip: internalapi
+                    metallb.universe.tf/loadBalancerIPs: 172.17.0.80
+                spec:
+                  type: LoadBalancer
       storageClass: ""
       storageRequest: 10G
       customServiceConfig: |