[18.0-fr5] Add top-level notificationsBus configuration

dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml

@@ -18,6 +18,7 @@ transformers:
 
 components:
   - ../../../../lib/control-plane
+  - ../../../../lib/control-plane/messaging-bus
   - ../../../../lib/dataplane/nodeset
 
 patches:
@@ -389,17 +390,6 @@ replacements:
   #
   # Notifications
   #
-  - 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

examples/dt/bgp-l3-xl/control-plane/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/bgp_dt01/control-plane/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/bgp_dt04_ipv6/control-plane/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/bmo01/control-plane/service-values.yaml

@@ -10,6 +10,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

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

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 
@@ -256,7 +258,8 @@ data:
       cell1:
         cellDatabaseInstance: openstack-cell1
         cellDatabaseAccount: nova-cell1
-        cellMessageBusInstance: rabbitmq-cell1
+        messagingBus:
+          cluster: rabbitmq-cell1
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true
@@ -275,7 +278,8 @@ data:
       cell3:
         cellDatabaseInstance: openstack-cell3
         cellDatabaseAccount: nova-cell3
-        cellMessageBusInstance: rabbitmq-cell3
+        messagingBus:
+          cluster: rabbitmq-cell3
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true

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

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/dcn/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 
@@ -317,7 +319,8 @@ data:
       cell1:
         cellDatabaseInstance: openstack-cell1
         cellDatabaseAccount: nova-cell1
-        cellMessageBusInstance: rabbitmq-cell1
+        messagingBus:
+          cluster: rabbitmq-cell1
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true
@@ -336,7 +339,8 @@ data:
       cell2:
         cellDatabaseInstance: openstack-cell2
         cellDatabaseAccount: nova-cell2
-        cellMessageBusInstance: rabbitmq-cell2
+        messagingBus:
+          cluster: rabbitmq-cell2
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true
@@ -355,7 +359,8 @@ data:
       cell3:
         cellDatabaseInstance: openstack-cell3
         cellDatabaseAccount: nova-cell3
-        cellMessageBusInstance: rabbitmq-cell3
+        messagingBus:
+          cluster: rabbitmq-cell3
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true

examples/dt/dz-storage/control-plane/service-values.yaml

@@ -11,6 +11,8 @@ data:
     name: default-spread-pods
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 
@@ -422,7 +424,8 @@ data:
         #   name: azone-node-affinity
         cellDatabaseInstance: openstack-cell1
         cellDatabaseAccount: nova-cell1
-        cellMessageBusInstance: rabbitmq-cell1
+        messagingBus:
+          cluster: rabbitmq-cell1
         conductorServiceTemplate:
           replicas: 1
         hasAPIAccess: true
@@ -436,7 +439,8 @@ data:
         #     name: bzone-node-affinity
         #   cellDatabaseInstance: openstack-cell2
         #   cellDatabaseAccount: nova-cell2
-        #   cellMessageBusInstance: rabbitmq-cell2
+        #   messagingBus:
+        #     cluster: rabbitmq-cell2
         #   conductorServiceTemplate:
         #     replicas: 1
         #   hasAPIAccess: true
@@ -448,7 +452,8 @@ data:
         #     name: czone-node-affinity
         #   cellDatabaseInstance: openstack-cell3
         #   cellDatabaseAccount: nova-cell3
-        #   cellMessageBusInstance: rabbitmq-cell3
+        #   messagingBus:
+        #     cluster: rabbitmq-cell3
         #   conductorServiceTemplate:
         #     replicas: 1
         #   hasAPIAccess: true

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/service-values.yaml

@@ -16,6 +16,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/service-values.yaml

@@ -16,6 +16,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/service-values.yaml

@@ -16,6 +16,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/service-values.yaml

@@ -16,6 +16,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nfv/nfv-ovs-dpdk-sriov-networker/service-values.yaml

@@ -16,6 +16,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nova/nova-three-cells/README.md

@@ -82,21 +82,24 @@ spec:
         cell0:
           cellDatabaseAccount: nova-cell0
           cellDatabaseInstance: openstack
-          cellMessageBusInstance: rabbitmq
+          messagingBus:
+            cluster: rabbitmq
           conductorServiceTemplate:
             replicas: 3
           hasAPIAccess: true
         cell1:
           cellDatabaseAccount: nova-cell1
           cellDatabaseInstance: openstack-cell1
-          cellMessageBusInstance: rabbitmq-cell1
+          messagingBus:
+            cluster: rabbitmq-cell1
           conductorServiceTemplate:
             replicas: 3
           hasAPIAccess: true
         cell2:
           cellDatabaseAccount: nova-cell2
           cellDatabaseInstance: openstack-cell2
-          cellMessageBusInstance: rabbitmq-cell2
+          messagingBus:
+            cluster: rabbitmq-cell2
           conductorServiceTemplate:
             replicas: 3
           hasAPIAccess: true

examples/dt/nova/nova-three-cells/control-plane/service-values.yaml

@@ -10,6 +10,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 
@@ -45,7 +47,8 @@ data:
         cell2:
           cellDatabaseAccount: nova-cell2
           cellDatabaseInstance: openstack-cell2
-          cellMessageBusInstance: rabbitmq-cell2
+          messagingBus:
+            cluster: rabbitmq-cell2
           conductorServiceTemplate:
             replicas: 1
           hasAPIAccess: true

examples/dt/nova/nova01alpha/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nova/nova02beta/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/nova/nova04delta/control-plane/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/osasinfra-ipv6/control-plane/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/osasinfra-ipv6/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/osasinfra/control-plane/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/osasinfra/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/perfscale/scalelab/service-values.yaml

@@ -8,6 +8,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/pidone/service-values.yaml

@@ -9,6 +9,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 

examples/dt/uni01alpha/README.md

@@ -357,7 +357,8 @@ spec:
         cell1:
           cellDatabaseAccount: nova-cell1
           cellDatabaseInstance: openstack-cell1
-          cellMessageBusInstance: rabbitmq-cell1
+          messagingBus:
+            cluster: rabbitmq-cell1
           hasAPIAccess: true
           novaComputeTemplates:
             compute-ironic:

examples/dt/uni01alpha/control-plane/service-values.yaml

@@ -10,6 +10,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""
 
@@ -81,12 +83,14 @@ data:
       cell0:
         cellDatabaseInstance: openstack
         cellDatabaseAccount: nova-cell0
-        cellMessageBusInstance: rabbitmq
+        messagingBus:
+          cluster: rabbitmq
         hasAPIAccess: true
       cell1:
         cellDatabaseInstance: openstack-cell1
         cellDatabaseAccount: nova-cell1
-        cellMessageBusInstance: rabbitmq-cell1
+        messagingBus:
+          cluster: rabbitmq-cell1
         hasAPIAccess: true
         novaComputeTemplates:
           compute-ironic:

examples/dt/uni02beta/control-plane/service-values.yaml

@@ -10,6 +10,8 @@ metadata:
 data:
   # --- Fields required by lib/control-plane ---
   preserveJobs: false
+  notificationsBus:
+    cluster: rabbitmq
   tls:
     caBundleSecretName: ""