[18.0-fr5] Add top-level notificationsBus configuration#703
Open
openshift-cherrypick-robot wants to merge 1 commit intoopenstack-k8s-operators:18.0-fr5from
Open
Conversation
This commit introduces a new messaging bus configuration structure while replacing deprecated field names with their modern equivalents. Changes: - Add notificationsBus.cluster to all service-values files - Use rabbitmq-notifications for va/hci and dt/uni05epsilon (dedicated cluster) - Use rabbitmq for all other deployments (default cluster) - Replace cellMessageBusInstance with messagingBus.cluster in nova cells - Replace notificationsBusInstance with top-level notificationsBus.cluster - Create lib/control-plane/messaging-bus kustomize component to inject notificationsBus from service-values ConfigMap into spec.notificationsBus - Update va/hci and dt/uni05epsilon kustomization files to use new messaging-bus component instead of manual notificationsBusInstance replacement - Update documentation (README files) to reflect new messagingBus structure Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Contributor
|
/lgtm I see #694 was merged in a hurry. I'll let @arxcruz control when the cherry pick is merged (Being careful so as to not disrupt @openstack-k8s-operators/ciops ) An example of how something like va/hci looks with this change (compared to fr5) is below. diff -ru /tmp/kustomize-diff-KMZHOz/base/hci/control-plane.yaml /tmp/kustomize-diff-KMZHOz/branch/hci/control-plane.yaml
--- /tmp/kustomize-diff-KMZHOz/base/hci/control-plane.yaml 2026-03-02 09:10:13.046535299 -0500
+++ /tmp/kustomize-diff-KMZHOz/branch/hci/control-plane.yaml 2026-03-02 09:10:11.614499387 -0500
@@ -325,6 +325,8 @@
preserveJobs: false
replicas: 3
secret: osp-secret
+ notificationsBus:
+ cluster: rabbitmq
nova:
apiOverride:
route: {}
@@ -346,17 +348,19 @@
cell0:
cellDatabaseAccount: nova-cell0
cellDatabaseInstance: openstack
- cellMessageBusInstance: rabbitmq
conductorServiceTemplate:
replicas: 1
hasAPIAccess: true
+ messagingBus:
+ cluster: rabbitmq
cell1:
cellDatabaseAccount: nova-cell1
cellDatabaseInstance: openstack-cell1
- cellMessageBusInstance: rabbitmq-cell1
conductorServiceTemplate:
replicas: 1
hasAPIAccess: true
+ messagingBus:
+ cluster: rabbitmq-cell1
metadataServiceTemplate:
override:
service:
diff -ru /tmp/kustomize-diff-KMZHOz/base/hci/edpm-post-ceph-nodeset.yaml /tmp/kustomize-diff-KMZHOz/branch/hci/edpm-post-ceph-nodeset.yaml
--- /tmp/kustomize-diff-KMZHOz/base/hci/edpm-post-ceph-nodeset.yaml 2026-03-02 09:10:13.269540891 -0500
+++ /tmp/kustomize-diff-KMZHOz/branch/hci/edpm-post-ceph-nodeset.yaml 2026-03-02 09:10:11.846505205 -0500
@@ -440,7 +440,8 @@
preserveJobs: false
replicas: 3
secret: osp-secret
- notificationsBusInstance: rabbitmq-notifications
+ notificationsBus:
+ cluster: rabbitmq-notifications
nova:
apiOverride:
route: {}
@@ -462,17 +463,19 @@
cell0:
cellDatabaseAccount: nova-cell0
cellDatabaseInstance: openstack
- cellMessageBusInstance: rabbitmq
conductorServiceTemplate:
replicas: 1
hasAPIAccess: true
+ messagingBus:
+ cluster: rabbitmq
cell1:
cellDatabaseAccount: nova-cell1
cellDatabaseInstance: openstack-cell1
- cellMessageBusInstance: rabbitmq-cell1
conductorServiceTemplate:
replicas: 1
hasAPIAccess: true
+ messagingBus:
+ cluster: rabbitmq-cell1
metadataServiceTemplate:
override:
service: |
Contributor
|
/lgtm to me too. Will require @openstack-k8s-operators/ciops for final approval, as @fultonj mentioned. |
Contributor
|
Still waiting on @openstack-k8s-operators/ciops for final approval |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abays, openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
fultonj
added
ci-ops-approved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated cherry-pick of #694
/assign karelyatin