Fix Telemetry for KUTTL

zzzeek · Dec 6, 2023 · c819e02 · c819e02
1 parent 2bb493a
commit c819e02
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 166 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -457,68 +457,6 @@ spec:
                     - serviceAccount
                     type: object
                 type: object
-              ceilometer:
-                properties:
-                  enabled:
-                    default: true
-                    type: boolean
-                  template:
-                    properties:
-                      centralImage:
-                        type: string
-                      computeImage:
-                        type: string
-                      customServiceConfig:
-                        default: '# add your customization here'
-                        type: string
-                      defaultConfigOverwrite:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      ipmiImage:
-                        type: string
-                      networkAttachmentDefinitions:
-                        items:
-                          type: string
-                        type: array
-                      nodeExporterImage:
-                        type: string
-                      notificationImage:
-                        type: string
-                      passwordSelector:
-                        default:
-                          service: CeilometerPassword
-                        properties:
-                          aodhService:
-                            default: AodhPassword
-                            type: string
-                          database:
-                            default: AodhDatabasePassword
-                            type: string
-                          service:
-                            default: CeilometerPassword
-                            type: string
-                        type: object
-                      rabbitMqClusterName:
-                        default: rabbitmq
-                        type: string
-                      secret:
-                        type: string
-                      serviceUser:
-                        default: ceilometer
-                        type: string
-                      sgCoreImage:
-                        type: string
-                    required:
-                    - centralImage
-                    - computeImage
-                    - ipmiImage
-                    - nodeExporterImage
-                    - notificationImage
-                    - secret
-                    - sgCoreImage
-                    type: object
-                type: object
               cinder:
                 properties:
                   apiOverride:
@@ -15335,6 +15273,9 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
+                          enabled:
+                            default: true
+                            type: boolean
                           ipmiImage:
                             type: string
                           networkAttachmentDefinitions:
@@ -15378,9 +15319,6 @@ spec:
                         - secret
                         - sgCoreImage
                         type: object
-                    required:
-                    - autoscaling
-                    - ceilometer
                     type: object
                 type: object
               tls:

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -457,68 +457,6 @@ spec:
                     - serviceAccount
                     type: object
                 type: object
-              ceilometer:
-                properties:
-                  enabled:
-                    default: true
-                    type: boolean
-                  template:
-                    properties:
-                      centralImage:
-                        type: string
-                      computeImage:
-                        type: string
-                      customServiceConfig:
-                        default: '# add your customization here'
-                        type: string
-                      defaultConfigOverwrite:
-                        additionalProperties:
-                          type: string
-                        type: object
-                      ipmiImage:
-                        type: string
-                      networkAttachmentDefinitions:
-                        items:
-                          type: string
-                        type: array
-                      nodeExporterImage:
-                        type: string
-                      notificationImage:
-                        type: string
-                      passwordSelector:
-                        default:
-                          service: CeilometerPassword
-                        properties:
-                          aodhService:
-                            default: AodhPassword
-                            type: string
-                          database:
-                            default: AodhDatabasePassword
-                            type: string
-                          service:
-                            default: CeilometerPassword
-                            type: string
-                        type: object
-                      rabbitMqClusterName:
-                        default: rabbitmq
-                        type: string
-                      secret:
-                        type: string
-                      serviceUser:
-                        default: ceilometer
-                        type: string
-                      sgCoreImage:
-                        type: string
-                    required:
-                    - centralImage
-                    - computeImage
-                    - ipmiImage
-                    - nodeExporterImage
-                    - notificationImage
-                    - secret
-                    - sgCoreImage
-                    type: object
-                type: object
               cinder:
                 properties:
                   apiOverride:
@@ -15335,6 +15273,9 @@ spec:
                             additionalProperties:
                               type: string
                             type: object
+                          enabled:
+                            default: true
+                            type: boolean
                           ipmiImage:
                             type: string
                           networkAttachmentDefinitions:
@@ -15378,9 +15319,6 @@ spec:
                         - secret
                         - sgCoreImage
                         type: object
-                    required:
-                    - autoscaling
-                    - ceilometer
                     type: object
                 type: object
               tls:

diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml
@@ -127,12 +127,18 @@ spec:
       ironicNeutronAgent:
         replicas: 1
       secret: osp-secret
-  ceilometer:
+  telemetry:
+    enabled: true
     template:
-      passwordSelector:
-        service: CeilometerPassword
-      secret: osp-secret
-      serviceUser: ceilometer
+      autoscaling:
+        aodh:
+          secret: osp-secret
+          serviceUser: aodh
+      ceilometer:
+        passwordSelector:
+          service: CeilometerPassword
+        secret: osp-secret
+        serviceUser: ceilometer
   swift:
     enabled: true
     template:
@@ -190,10 +196,6 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneCAReadyCondition
-  - message: OpenStackControlPlane Ceilometer completed
-    reason: Ready
-    status: "True"
-    type: OpenStackControlPlaneCeilometerReady
   - message: OpenStackControlPlane Cinder completed
     reason: Ready
     status: "True"
@@ -274,3 +276,7 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneSwiftReady
+  - message: OpenStackControlPlane Telemetry completed
+    reason: Ready
+    status: "True"
+    type: OpenStackControlPlaneTelemetryReady
diff --git a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml
@@ -100,12 +100,18 @@ spec:
       ironicNeutronAgent:
         replicas: 1
       secret: osp-secret
-  ceilometer:
+  telemetry:
+    enabled: true
     template:
-      passwordSelector:
-        service: CeilometerPassword
-      secret: osp-secret
-      serviceUser: ceilometer
+      autoscaling:
+        aodh:
+          secret: osp-secret
+          serviceUser: aodh
+      ceilometer:
+        passwordSelector:
+          service: CeilometerPassword
+        secret: osp-secret
+        serviceUser: ceilometer
   barbican:
     enabled: true
     template:
@@ -137,10 +143,6 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneCAReadyCondition
-  - message: OpenStackControlPlane Ceilometer completed
-    reason: Ready
-    status: "True"
-    type: OpenStackControlPlaneCeilometerReady
   - message: OpenStackControlPlane Cinder completed
     reason: Ready
     status: "True"
@@ -213,3 +215,7 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneRabbitMQReady
+  - message: OpenStackControlPlane Telemetry completed
+    reason: Ready
+    status: "True"
+    type: OpenStackControlPlaneTelemetryReady
diff --git a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml
@@ -121,12 +121,18 @@ spec:
       ironicNeutronAgent:
         replicas: 1
       secret: osp-secret
-  ceilometer:
+  telemetry:
+    enabled: true
     template:
-      passwordSelector:
-        service: CeilometerPassword
-      secret: osp-secret
-      serviceUser: ceilometer
+      autoscaling:
+        aodh:
+          secret: osp-secret
+          serviceUser: aodh
+      ceilometer:
+        passwordSelector:
+          service: CeilometerPassword
+        secret: osp-secret
+        serviceUser: ceilometer
   tls:
     endpoint:
       internal:
@@ -147,10 +153,6 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneCAReadyCondition
-  - message: OpenStackControlPlane Ceilometer completed
-    reason: Ready
-    status: "True"
-    type: OpenStackControlPlaneCeilometerReady
   - message: OpenStackControlPlane Cinder completed
     reason: Ready
     status: "True"
@@ -223,3 +225,7 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneRabbitMQReady
+  - message: OpenStackControlPlane Telemetry completed
+    reason: Ready
+    status: "True"
+    type: OpenStackControlPlaneTelemetryReady
diff --git a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml
@@ -131,12 +131,18 @@ spec:
       ironicNeutronAgent:
         replicas: 1
       secret: osp-secret
-  ceilometer:
+  telemetry:
+    enabled: true
     template:
-      passwordSelector:
-        service: CeilometerPassword
-      secret: osp-secret
-      serviceUser: ceilometer
+      autoscaling:
+        aodh:
+          secret: osp-secret
+          serviceUser: aodh
+      ceilometer:
+        passwordSelector:
+          service: CeilometerPassword
+        secret: osp-secret
+        serviceUser: ceilometer
   swift:
     enabled: true
     template:
@@ -166,10 +172,6 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneCAReadyCondition
-  - message: OpenStackControlPlane Ceilometer completed
-    reason: Ready
-    status: "True"
-    type: OpenStackControlPlaneCeilometerReady
   - message: OpenStackControlPlane Cinder completed
     reason: Ready
     status: "True"
@@ -250,3 +252,7 @@ status:
     reason: Ready
     status: "True"
     type: OpenStackControlPlaneSwiftReady
+  - message: OpenStackControlPlane Telemetry completed
+    reason: Ready
+    status: "True"
+    type: OpenStackControlPlaneTelemetryReady