Merge pull request #630 from morenod/watcher_using_notifications

Enable rabbitmq-notifications queue at openstack controlplane level for va/hci

Enable rabbitmq-notifications at controlplane level
Removed non required watcher configurations when notifications are enabled.

Required to test watcher using nova and cinder notifications

Reviewed-by: Joan Francesc Gilabert
Reviewed-by: David Sanz Moreno
Reviewed-by: Szymon Datko
Reviewed-by: John Fulton <[email protected]>

Author: softwarefactory-project-zuul[bot]

examples/va/hci/service-values.yaml

@@ -8,6 +8,7 @@ metadata:
     config.kubernetes.io/local-config: "true"
 data:
   preserveJobs: false
+  notificationsBusInstance: rabbitmq-notifications
   cinderAPI:
     replicas: 3
   cinderBackup:
@@ -120,11 +121,17 @@ data:
       expiration = 28800
   heat:
     enabled: true
+  rabbitmq:
+    templates:
+      rabbitmq-notifications:
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.87
+            spec:
+              type: LoadBalancer
+        replicas: 3
   watcher:
     enabled: true
-    decisionengineServiceTemplate:
-      customServiceConfig: |
-        [watcher_cluster_data_model_collectors.compute]
-        period = 60
-        [watcher_cluster_data_model_collectors.storage]
-        period = 60

va/hci/edpm-post-ceph/nodeset/kustomization.yaml

@@ -38,6 +38,28 @@ patches:
 
 replacements:
   # Control plane custom service configs
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.notificationsBusInstance
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.notificationsBusInstance
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.rabbitmq.templates.rabbitmq-notifications
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.rabbitmq.templates.rabbitmq-notifications
+        options:
+          create: true
   - source:
       kind: ConfigMap
       name: service-values
@@ -299,14 +321,3 @@ replacements:
           - spec.watcher.enabled
         options:
           create: true
-  - source:
-      kind: ConfigMap
-      name: service-values
-      fieldPath: data.watcher.decisionengineServiceTemplate.customServiceConfig
-    targets:
-      - select:
-          kind: OpenStackControlPlane
-        fieldPaths:
-          - spec.watcher.template.decisionengineServiceTemplate.customServiceConfig
-        options:
-          create: true