diff --git a/dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml b/dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml index 1770eed36..a5aa147bb 100644 --- a/dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml +++ b/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 diff --git a/examples/dt/bgp-l3-xl/control-plane/service-values.yaml b/examples/dt/bgp-l3-xl/control-plane/service-values.yaml index ee04bf940..1c4364e3c 100644 --- a/examples/dt/bgp-l3-xl/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/bgp_dt01/control-plane/service-values.yaml b/examples/dt/bgp_dt01/control-plane/service-values.yaml index 4431f5951..e643d3308 100644 --- a/examples/dt/bgp_dt01/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/bgp_dt04_ipv6/control-plane/service-values.yaml b/examples/dt/bgp_dt04_ipv6/control-plane/service-values.yaml index ee04bf940..1c4364e3c 100644 --- a/examples/dt/bgp_dt04_ipv6/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/bmo01/control-plane/service-values.yaml b/examples/dt/bmo01/control-plane/service-values.yaml index 9e59a0848..6f62e21fd 100644 --- a/examples/dt/bmo01/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/dcn/control-plane/scaledown/service-values.yaml b/examples/dt/dcn/control-plane/scaledown/service-values.yaml index 0e3726472..8d8f8f275 100644 --- a/examples/dt/dcn/control-plane/scaledown/service-values.yaml +++ b/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 diff --git a/examples/dt/dcn/control-plane/service-values.yaml b/examples/dt/dcn/control-plane/service-values.yaml index 802483163..790a508a1 100644 --- a/examples/dt/dcn/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/dcn/service-values.yaml b/examples/dt/dcn/service-values.yaml index 26422865d..b982d8da1 100644 --- a/examples/dt/dcn/service-values.yaml +++ b/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 diff --git a/examples/dt/dz-storage/control-plane/service-values.yaml b/examples/dt/dz-storage/control-plane/service-values.yaml index a8224a13e..262428f39 100644 --- a/examples/dt/dz-storage/control-plane/service-values.yaml +++ b/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 diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/service-values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/service-values.yaml index 4d5fa3a23..08f9487cc 100644 --- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/service-values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/service-values.yaml index caee6a546..bfdb00995 100644 --- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/service-values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/service-values.yaml index 9672b4660..4afe1d57f 100644 --- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/service-values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/service-values.yaml index 4d5fa3a23..08f9487cc 100644 --- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-ipv6-2nodesets/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nfv/nfv-ovs-dpdk-sriov-networker/service-values.yaml b/examples/dt/nfv/nfv-ovs-dpdk-sriov-networker/service-values.yaml index f63819eb7..5a54f6929 100644 --- a/examples/dt/nfv/nfv-ovs-dpdk-sriov-networker/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nova/nova-three-cells/README.md b/examples/dt/nova/nova-three-cells/README.md index 4ef7bb1c7..3afaee08f 100644 --- a/examples/dt/nova/nova-three-cells/README.md +++ b/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 diff --git a/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml b/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml index 11e049cb1..605081325 100644 --- a/examples/dt/nova/nova-three-cells/control-plane/service-values.yaml +++ b/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 diff --git a/examples/dt/nova/nova01alpha/service-values.yaml b/examples/dt/nova/nova01alpha/service-values.yaml index 1a2242847..a653f0ad9 100644 --- a/examples/dt/nova/nova01alpha/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nova/nova02beta/service-values.yaml b/examples/dt/nova/nova02beta/service-values.yaml index 479b5946c..e35792baa 100644 --- a/examples/dt/nova/nova02beta/service-values.yaml +++ b/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: "" diff --git a/examples/dt/nova/nova04delta/control-plane/service-values.yaml b/examples/dt/nova/nova04delta/control-plane/service-values.yaml index 7b4147cd6..2d31480d2 100644 --- a/examples/dt/nova/nova04delta/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/osasinfra-ipv6/control-plane/service-values.yaml b/examples/dt/osasinfra-ipv6/control-plane/service-values.yaml index 802483163..790a508a1 100644 --- a/examples/dt/osasinfra-ipv6/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/osasinfra-ipv6/service-values.yaml b/examples/dt/osasinfra-ipv6/service-values.yaml index 7fd8fba7f..e5182e30b 100644 --- a/examples/dt/osasinfra-ipv6/service-values.yaml +++ b/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: "" diff --git a/examples/dt/osasinfra/control-plane/service-values.yaml b/examples/dt/osasinfra/control-plane/service-values.yaml index 802483163..790a508a1 100644 --- a/examples/dt/osasinfra/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/osasinfra/service-values.yaml b/examples/dt/osasinfra/service-values.yaml index 9695503ae..d491d6d0e 100644 --- a/examples/dt/osasinfra/service-values.yaml +++ b/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: "" diff --git a/examples/dt/perfscale/scalelab/service-values.yaml b/examples/dt/perfscale/scalelab/service-values.yaml index 686ae6e36..3e6c09db9 100644 --- a/examples/dt/perfscale/scalelab/service-values.yaml +++ b/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: "" diff --git a/examples/dt/pidone/service-values.yaml b/examples/dt/pidone/service-values.yaml index 9edf61d7c..e35fe8b29 100644 --- a/examples/dt/pidone/service-values.yaml +++ b/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: "" diff --git a/examples/dt/uni01alpha/README.md b/examples/dt/uni01alpha/README.md index 048c1e54c..f3572ff52 100644 --- a/examples/dt/uni01alpha/README.md +++ b/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: diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml index a1351df31..a109e65c9 100644 --- a/examples/dt/uni01alpha/control-plane/service-values.yaml +++ b/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: diff --git a/examples/dt/uni02beta/control-plane/service-values.yaml b/examples/dt/uni02beta/control-plane/service-values.yaml index 4167dbcea..60b0e5fb6 100644 --- a/examples/dt/uni02beta/control-plane/service-values.yaml +++ b/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: "" diff --git a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml index bc16a6196..74c0d85e4 100644 --- a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml +++ b/examples/dt/uni04delta-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: "" @@ -165,12 +167,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: diff --git a/examples/dt/uni04delta/control-plane/service-values.yaml b/examples/dt/uni04delta/control-plane/service-values.yaml index 497817512..95540914e 100644 --- a/examples/dt/uni04delta/control-plane/service-values.yaml +++ b/examples/dt/uni04delta/control-plane/service-values.yaml @@ -10,6 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/dt/uni05epsilon/control-plane/service-values.yaml b/examples/dt/uni05epsilon/control-plane/service-values.yaml index d66553f21..14fc7f872 100644 --- a/examples/dt/uni05epsilon/control-plane/service-values.yaml +++ b/examples/dt/uni05epsilon/control-plane/service-values.yaml @@ -10,6 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" @@ -27,7 +29,8 @@ data: cell2: cellDatabaseAccount: nova-cell2 cellDatabaseInstance: openstack-cell2 - cellMessageBusInstance: rabbitmq-cell2 + messagingBus: + cluster: rabbitmq-cell2 conductorServiceTemplate: replicas: 1 hasAPIAccess: true diff --git a/examples/dt/uni05epsilon/service-values.yaml b/examples/dt/uni05epsilon/service-values.yaml index 5ff0d6ac0..157a46b6c 100644 --- a/examples/dt/uni05epsilon/service-values.yaml +++ b/examples/dt/uni05epsilon/service-values.yaml @@ -10,7 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false - notificationsBusInstance: rabbitmq-notifications + notificationsBus: + cluster: rabbitmq-notifications tls: caBundleSecretName: "" @@ -141,7 +142,8 @@ data: cell2: cellDatabaseAccount: nova-cell2 cellDatabaseInstance: openstack-cell2 - cellMessageBusInstance: rabbitmq-cell2 + messagingBus: + cluster: rabbitmq-cell2 conductorServiceTemplate: replicas: 1 hasAPIAccess: true diff --git a/examples/dt/uni06zeta/control-plane/service-values.yaml b/examples/dt/uni06zeta/control-plane/service-values.yaml index b8822a295..a12259f48 100644 --- a/examples/dt/uni06zeta/control-plane/service-values.yaml +++ b/examples/dt/uni06zeta/control-plane/service-values.yaml @@ -10,6 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/dt/uni07eta/control-plane/service-values.yaml b/examples/dt/uni07eta/control-plane/service-values.yaml index 7d1cb85ca..fb5017d9d 100644 --- a/examples/dt/uni07eta/control-plane/service-values.yaml +++ b/examples/dt/uni07eta/control-plane/service-values.yaml @@ -10,6 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/dt/uni09iota/control-plane/service-values.yaml b/examples/dt/uni09iota/control-plane/service-values.yaml index 8d709bb67..3eafce429 100644 --- a/examples/dt/uni09iota/control-plane/service-values.yaml +++ b/examples/dt/uni09iota/control-plane/service-values.yaml @@ -10,6 +10,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/hci/control-plane/service-values.yaml b/examples/va/hci/control-plane/service-values.yaml index 802483163..790a508a1 100644 --- a/examples/va/hci/control-plane/service-values.yaml +++ b/examples/va/hci/control-plane/service-values.yaml @@ -8,6 +8,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/hci/service-values.yaml b/examples/va/hci/service-values.yaml index e5d2046ed..802dbb127 100644 --- a/examples/va/hci/service-values.yaml +++ b/examples/va/hci/service-values.yaml @@ -9,7 +9,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false - notificationsBusInstance: rabbitmq-notifications + notificationsBus: + cluster: rabbitmq-notifications tls: caBundleSecretName: "" diff --git a/examples/va/multi-namespace/control-plane/service-values.yaml b/examples/va/multi-namespace/control-plane/service-values.yaml index 722194e7b..b41b1d3fb 100644 --- a/examples/va/multi-namespace/control-plane/service-values.yaml +++ b/examples/va/multi-namespace/control-plane/service-values.yaml @@ -8,6 +8,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/multi-namespace/control-plane2/service-values.yaml b/examples/va/multi-namespace/control-plane2/service-values.yaml index 722194e7b..b41b1d3fb 100644 --- a/examples/va/multi-namespace/control-plane2/service-values.yaml +++ b/examples/va/multi-namespace/control-plane2/service-values.yaml @@ -8,6 +8,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nfv/ovs-dpdk-networker/service-values.yaml b/examples/va/nfv/ovs-dpdk-networker/service-values.yaml index 087b9beac..6e792f658 100644 --- a/examples/va/nfv/ovs-dpdk-networker/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk-networker/service-values.yaml @@ -16,6 +16,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nfv/ovs-dpdk-sriov-ipv6/service-values.yaml b/examples/va/nfv/ovs-dpdk-sriov-ipv6/service-values.yaml index 3bd9bb870..e6746a373 100644 --- a/examples/va/nfv/ovs-dpdk-sriov-ipv6/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk-sriov-ipv6/service-values.yaml @@ -16,6 +16,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml b/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml index 3bd9bb870..e6746a373 100644 --- a/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk-sriov/service-values.yaml @@ -16,6 +16,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nfv/ovs-dpdk/service-values.yaml b/examples/va/nfv/ovs-dpdk/service-values.yaml index 4f4a8a0eb..20c790d8b 100644 --- a/examples/va/nfv/ovs-dpdk/service-values.yaml +++ b/examples/va/nfv/ovs-dpdk/service-values.yaml @@ -16,6 +16,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nfv/sriov/service-values.yaml b/examples/va/nfv/sriov/service-values.yaml index 9ce257183..ea5b1498a 100644 --- a/examples/va/nfv/sriov/service-values.yaml +++ b/examples/va/nfv/sriov/service-values.yaml @@ -9,6 +9,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nvidia-mdev/control-plane/service-values.yaml b/examples/va/nvidia-mdev/control-plane/service-values.yaml index 57b0a90b7..041785406 100644 --- a/examples/va/nvidia-mdev/control-plane/service-values.yaml +++ b/examples/va/nvidia-mdev/control-plane/service-values.yaml @@ -8,6 +8,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/examples/va/nvidia-vfio-passthrough/control-plane/service-values.yaml b/examples/va/nvidia-vfio-passthrough/control-plane/service-values.yaml index 7b4147cd6..2d31480d2 100644 --- a/examples/va/nvidia-vfio-passthrough/control-plane/service-values.yaml +++ b/examples/va/nvidia-vfio-passthrough/control-plane/service-values.yaml @@ -9,6 +9,8 @@ metadata: data: # --- Fields required by lib/control-plane --- preserveJobs: false + notificationsBus: + cluster: rabbitmq tls: caBundleSecretName: "" diff --git a/lib/control-plane/base/openstackcontrolplane.yaml b/lib/control-plane/base/openstackcontrolplane.yaml index 6c9c5daea..08f3a0256 100644 --- a/lib/control-plane/base/openstackcontrolplane.yaml +++ b/lib/control-plane/base/openstackcontrolplane.yaml @@ -192,14 +192,16 @@ spec: cell0: cellDatabaseAccount: nova-cell0 cellDatabaseInstance: openstack - cellMessageBusInstance: rabbitmq + messagingBus: + cluster: rabbitmq conductorServiceTemplate: replicas: 1 hasAPIAccess: true cell1: cellDatabaseAccount: nova-cell1 cellDatabaseInstance: openstack-cell1 - cellMessageBusInstance: rabbitmq-cell1 + messagingBus: + cluster: rabbitmq-cell1 conductorServiceTemplate: replicas: 1 hasAPIAccess: true @@ -249,6 +251,8 @@ spec: replicas: 3 rabbitmq-cell1: replicas: 3 + notificationsBus: + cluster: rabbitmq secret: osp-secret storageClass: _replaced_ swift: diff --git a/lib/control-plane/kustomization.yaml b/lib/control-plane/kustomization.yaml index aa32553d2..1bf16245d 100644 --- a/lib/control-plane/kustomization.yaml +++ b/lib/control-plane/kustomization.yaml @@ -10,3 +10,4 @@ components: - ovn-bridge - job-settings - tls + - messaging-bus diff --git a/lib/control-plane/messaging-bus/kustomization.yaml b/lib/control-plane/messaging-bus/kustomization.yaml new file mode 100644 index 000000000..b7c476dc8 --- /dev/null +++ b/lib/control-plane/messaging-bus/kustomization.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +replacements: + # Top-level notificationsBus configuration + - source: + kind: ConfigMap + name: service-values + fieldPath: data.notificationsBus + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.notificationsBus + options: + create: true diff --git a/va/hci/edpm-post-ceph/nodeset/kustomization.yaml b/va/hci/edpm-post-ceph/nodeset/kustomization.yaml index 0250123f0..452fb2281 100644 --- a/va/hci/edpm-post-ceph/nodeset/kustomization.yaml +++ b/va/hci/edpm-post-ceph/nodeset/kustomization.yaml @@ -24,6 +24,7 @@ components: - ../../../../lib/control-plane/storage - ../../../../lib/control-plane/ovn-nic - ../../../../lib/control-plane/job-settings + - ../../../../lib/control-plane/messaging-bus - ../../../../lib/dataplane/nodeset resources: @@ -38,17 +39,6 @@ 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 diff --git a/va/hci/kustomization.yaml b/va/hci/kustomization.yaml index 96bd6691e..f855e9f1f 100644 --- a/va/hci/kustomization.yaml +++ b/va/hci/kustomization.yaml @@ -24,4 +24,5 @@ components: - ../../lib/control-plane/storage - ../../lib/control-plane/ovn-nic - ../../lib/control-plane/job-settings + - ../../lib/control-plane/messaging-bus - ../../lib/control-plane/tls