Move glance to the new API definition

GlanceAPI has been simplified by patches [1][2], and the implication of those patches is a change in the CRD used to define the glanceAPI service. This patch aligns both the existing documentation and the test suite to work with the new way of deploying glance. [1] openstack-k8s-operators/glance-operator#329 [2] openstack-k8s-operators/openstack-operator#514 Signed-off-by: Francesco Pantano <[email protected]>
bogdando · Nov 27, 2023 · 35e7b0f · 35e7b0f
1 parent 6ace79c
commit 35e7b0f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 25 deletions.
diff --git a/docs/openstack/backend_services_deployment.md b/docs/openstack/backend_services_deployment.md
@@ -150,8 +150,7 @@ podified OpenStack control plane services.
     glance:
       enabled: false
       template:
-        glanceAPIInternal: {}
-        glanceAPIExternal: {}
+        glanceAPI: {}
 
     horizon:
       enabled: false

diff --git a/docs/openstack/glance_adoption.md b/docs/openstack/glance_adoption.md
@@ -42,7 +42,7 @@ spec:
       databaseInstance: openstack
       storageClass: "local-storage"
       storageRequest: 10G
-      glanceAPIInternal:
+      glanceAPI:
         override:
           service:
             metadata:
@@ -54,9 +54,6 @@ spec:
               type: LoadBalancer
         networkAttachments:
         - storage
-      glanceAPIExternal:
-        networkAttachments:
-        - storage
 '
 ```
 
@@ -90,7 +87,7 @@ spec:
         store_description=Ceph glance store backend.
       storageClass: "local-storage"
       storageRequest: 10G
-      glanceAPIInternal:
+      glanceAPI:
         override:
           service:
             metadata:
@@ -102,9 +99,6 @@ spec:
               type: LoadBalancer
         networkAttachments:
         - storage
-      glanceAPIExternal:
-        networkAttachments:
-        - storage
 EOF
 ```
 

diff --git a/tests/config/base/openstack_control_plane.yaml b/tests/config/base/openstack_control_plane.yaml
@@ -34,8 +34,7 @@ spec:
   glance:
     enabled: false
     template:
-      glanceAPIInternal: {}
-      glanceAPIExternal: {}
+      glanceAPI: {}
 
   horizon:
     enabled: false

diff --git a/tests/config/periodic_ci/container_image_overrides.yaml b/tests/config/periodic_ci/container_image_overrides.yaml
@@ -32,8 +32,7 @@ spec:
   glance:
     enabled: false
     template:
-      glanceAPIInternal: {}
-      glanceAPIExternal: {}
+      glanceAPI: {}
 
   horizon:
     enabled: false

diff --git a/tests/roles/backend_services/templates/container_overrides.j2 b/tests/roles/backend_services/templates/container_overrides.j2
@@ -17,9 +17,7 @@ spec:
 
   glance:
     template:
-      glanceAPIInternal:
-        containerImage: {{ container_registry }}/{{ container_namespace }}/openstack-glance-api:{{ container_tag }}
-      glanceAPIExternal:
+      glanceAPI:
         containerImage: {{ container_registry }}/{{ container_namespace }}/openstack-glance-api:{{ container_tag }}
 
   horizon:

diff --git a/tests/roles/glance_adoption/tasks/main.yaml b/tests/roles/glance_adoption/tasks/main.yaml
@@ -12,7 +12,7 @@
           databaseInstance: openstack
           storageClass: "local-storage"
           storageRequest: 10G
-          glanceAPIInternal:
+          glanceAPI:
             override:
               service:
                 metadata:
@@ -24,9 +24,6 @@
                   type: LoadBalancer
             networkAttachments:
             - storage
-          glanceAPIExternal:
-            networkAttachments:
-            - storage
     '
   when: glance_backend == 'local'
 
@@ -52,7 +49,7 @@
             store_description=Ceph glance store backend.
           storageClass: "local-storage"
           storageRequest: 10G
-          glanceAPIInternal:
+          glanceAPI:
             override:
               service:
                 metadata:
@@ -64,9 +61,6 @@
                   type: LoadBalancer
             networkAttachments:
             - storage
-          glanceAPIExternal:
-            networkAttachments:
-            - storage
     '
   when: glance_backend == 'ceph'