Skip to content

Commit 05817bd

Browse files
lmicciniclaude
andcommitted
Add top-level notificationsBus and replace deprecated messaging fields
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>
1 parent 52c2a16 commit 05817bd

File tree

51 files changed

+151
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+151
-45
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ transformers:
1818
1919
components:
2020
- ../../../../lib/control-plane
21+
- ../../../../lib/control-plane/messaging-bus
2122
- ../../../../lib/dataplane/nodeset
2223

2324
patches:
@@ -389,17 +390,6 @@ replacements:
389390
#
390391
# Notifications
391392
#
392-
- source:
393-
kind: ConfigMap
394-
name: service-values
395-
fieldPath: data.notificationsBusInstance
396-
targets:
397-
- select:
398-
kind: OpenStackControlPlane
399-
fieldPaths:
400-
- spec.notificationsBusInstance
401-
options:
402-
create: true
403393
- source:
404394
kind: ConfigMap
405395
name: service-values

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ metadata:
1010
data:
1111
# --- Fields required by lib/control-plane ---
1212
preserveJobs: false
13+
notificationsBus:
14+
cluster: rabbitmq
1315
tls:
1416
caBundleSecretName: ""
1517

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

@@ -256,7 +258,8 @@ data:
256258
cell1:
257259
cellDatabaseInstance: openstack-cell1
258260
cellDatabaseAccount: nova-cell1
259-
cellMessageBusInstance: rabbitmq-cell1
261+
messagingBus:
262+
cluster: rabbitmq-cell1
260263
conductorServiceTemplate:
261264
replicas: 1
262265
hasAPIAccess: true
@@ -275,7 +278,8 @@ data:
275278
cell3:
276279
cellDatabaseInstance: openstack-cell3
277280
cellDatabaseAccount: nova-cell3
278-
cellMessageBusInstance: rabbitmq-cell3
281+
messagingBus:
282+
cluster: rabbitmq-cell3
279283
conductorServiceTemplate:
280284
replicas: 1
281285
hasAPIAccess: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ metadata:
88
data:
99
# --- Fields required by lib/control-plane ---
1010
preserveJobs: false
11+
notificationsBus:
12+
cluster: rabbitmq
1113
tls:
1214
caBundleSecretName: ""
1315

examples/dt/dcn/service-values.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ metadata:
99
data:
1010
# --- Fields required by lib/control-plane ---
1111
preserveJobs: false
12+
notificationsBus:
13+
cluster: rabbitmq
1214
tls:
1315
caBundleSecretName: ""
1416

@@ -317,7 +319,8 @@ data:
317319
cell1:
318320
cellDatabaseInstance: openstack-cell1
319321
cellDatabaseAccount: nova-cell1
320-
cellMessageBusInstance: rabbitmq-cell1
322+
messagingBus:
323+
cluster: rabbitmq-cell1
321324
conductorServiceTemplate:
322325
replicas: 1
323326
hasAPIAccess: true
@@ -336,7 +339,8 @@ data:
336339
cell2:
337340
cellDatabaseInstance: openstack-cell2
338341
cellDatabaseAccount: nova-cell2
339-
cellMessageBusInstance: rabbitmq-cell2
342+
messagingBus:
343+
cluster: rabbitmq-cell2
340344
conductorServiceTemplate:
341345
replicas: 1
342346
hasAPIAccess: true
@@ -355,7 +359,8 @@ data:
355359
cell3:
356360
cellDatabaseInstance: openstack-cell3
357361
cellDatabaseAccount: nova-cell3
358-
cellMessageBusInstance: rabbitmq-cell3
362+
messagingBus:
363+
cluster: rabbitmq-cell3
359364
conductorServiceTemplate:
360365
replicas: 1
361366
hasAPIAccess: true

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ data:
1111
name: default-spread-pods
1212
# --- Fields required by lib/control-plane ---
1313
preserveJobs: false
14+
notificationsBus:
15+
cluster: rabbitmq
1416
tls:
1517
caBundleSecretName: ""
1618

@@ -422,7 +424,8 @@ data:
422424
# name: azone-node-affinity
423425
cellDatabaseInstance: openstack-cell1
424426
cellDatabaseAccount: nova-cell1
425-
cellMessageBusInstance: rabbitmq-cell1
427+
messagingBus:
428+
cluster: rabbitmq-cell1
426429
conductorServiceTemplate:
427430
replicas: 1
428431
hasAPIAccess: true
@@ -436,7 +439,8 @@ data:
436439
# name: bzone-node-affinity
437440
# cellDatabaseInstance: openstack-cell2
438441
# cellDatabaseAccount: nova-cell2
439-
# cellMessageBusInstance: rabbitmq-cell2
442+
# messagingBus:
443+
# cluster: rabbitmq-cell2
440444
# conductorServiceTemplate:
441445
# replicas: 1
442446
# hasAPIAccess: true
@@ -448,7 +452,8 @@ data:
448452
# name: czone-node-affinity
449453
# cellDatabaseInstance: openstack-cell3
450454
# cellDatabaseAccount: nova-cell3
451-
# cellMessageBusInstance: rabbitmq-cell3
455+
# messagingBus:
456+
# cluster: rabbitmq-cell3
452457
# conductorServiceTemplate:
453458
# replicas: 1
454459
# hasAPIAccess: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ metadata:
1616
data:
1717
# --- Fields required by lib/control-plane ---
1818
preserveJobs: false
19+
notificationsBus:
20+
cluster: rabbitmq
1921
tls:
2022
caBundleSecretName: ""
2123

0 commit comments

Comments
 (0)