Skip to content

Commit 4896475

Browse files
lmicciniclaude
andcommitted
Add top-level notificationsBus configuration
- Add notificationsBus.cluster to all telemetry-enabled deployments - Use rabbitmq-notifications for va/hci and dt/uni05epsilon (dedicated cluster) - Use rabbitmq for all other deployments (default cluster) - Add notificationsBus.cluster: rabbitmq to all other service-values files as placeholder to enable kustomize component to work universally - Create lib/control-plane/messaging-bus kustomize component to inject notificationsBus from service-values ConfigMap into spec.notificationsBus - Remove deprecated nova.notificationsBus replacements from kustomization files (replaced by top-level spec.notificationsBus) - Update va/hci and dt/uni05epsilon to use new notificationsBus.cluster format instead of deprecated notificationsBusInstance Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 52c2a16 commit 4896475

File tree

55 files changed

+329
-131
lines changed

Some content is hidden

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

55 files changed

+329
-131
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ replacements:
326326
- source:
327327
kind: ConfigMap
328328
name: service-values
329-
fieldPath: data.telemetry.metricStorage.enabled
329+
fieldPath: data.telemetry.template.metricStorage.enabled
330330
targets:
331331
- select:
332332
kind: OpenStackControlPlane
@@ -338,7 +338,7 @@ replacements:
338338
- source:
339339
kind: ConfigMap
340340
name: service-values
341-
fieldPath: data.telemetry.ceilometer.enabled
341+
fieldPath: data.telemetry.template.ceilometer.enabled
342342
targets:
343343
- select:
344344
kind: OpenStackControlPlane

dt/uni01alpha/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ replacements:
307307
- source:
308308
kind: ConfigMap
309309
name: service-values
310-
fieldPath: data.heat.customServiceConfig
310+
fieldPath: data.heat.template.customServiceConfig
311311
targets:
312312
- select:
313313
kind: OpenStackControlPlane
@@ -331,7 +331,7 @@ replacements:
331331
- source:
332332
kind: ConfigMap
333333
name: service-values
334-
fieldPath: data.telemetry.metricStorage.enabled
334+
fieldPath: data.telemetry.template.metricStorage.enabled
335335
targets:
336336
- select:
337337
kind: OpenStackControlPlane
@@ -343,7 +343,7 @@ replacements:
343343
- source:
344344
kind: ConfigMap
345345
name: service-values
346-
fieldPath: data.telemetry.autoscaling.enabled
346+
fieldPath: data.telemetry.template.autoscaling.enabled
347347
targets:
348348
- select:
349349
kind: OpenStackControlPlane
@@ -355,7 +355,7 @@ replacements:
355355
- source:
356356
kind: ConfigMap
357357
name: service-values
358-
fieldPath: data.telemetry.ceilometer.enabled
358+
fieldPath: data.telemetry.template.ceilometer.enabled
359359
targets:
360360
- select:
361361
kind: OpenStackControlPlane

dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ replacements:
217217
- source:
218218
kind: ConfigMap
219219
name: service-values
220-
fieldPath: data.telemetry.metricStorage.enabled
220+
fieldPath: data.telemetry.template.metricStorage.enabled
221221
targets:
222222
- select:
223223
kind: OpenStackControlPlane
@@ -229,7 +229,7 @@ replacements:
229229
- source:
230230
kind: ConfigMap
231231
name: service-values
232-
fieldPath: data.telemetry.autoscaling.enabled
232+
fieldPath: data.telemetry.template.autoscaling.enabled
233233
targets:
234234
- select:
235235
kind: OpenStackControlPlane
@@ -241,7 +241,7 @@ replacements:
241241
- source:
242242
kind: ConfigMap
243243
name: service-values
244-
fieldPath: data.telemetry.ceilometer.enabled
244+
fieldPath: data.telemetry.template.ceilometer.enabled
245245
targets:
246246
- select:
247247
kind: OpenStackControlPlane

dt/uni04delta-ipv6/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ replacements:
5959
- source:
6060
kind: ConfigMap
6161
name: service-values
62-
fieldPath: data.telemetry.metricStorage.enabled
62+
fieldPath: data.telemetry.template.metricStorage.enabled
6363
targets:
6464
- select:
6565
kind: OpenStackControlPlane
@@ -71,7 +71,7 @@ replacements:
7171
- source:
7272
kind: ConfigMap
7373
name: service-values
74-
fieldPath: data.telemetry.autoscaling.enabled
74+
fieldPath: data.telemetry.template.autoscaling.enabled
7575
targets:
7676
- select:
7777
kind: OpenStackControlPlane
@@ -83,7 +83,7 @@ replacements:
8383
- source:
8484
kind: ConfigMap
8585
name: service-values
86-
fieldPath: data.telemetry.ceilometer.enabled
86+
fieldPath: data.telemetry.template.ceilometer.enabled
8787
targets:
8888
- select:
8989
kind: OpenStackControlPlane

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -387,19 +387,8 @@ replacements:
387387
create: true
388388

389389
#
390-
# Notifications
390+
# Notifications (rabbitmq-notifications template)
391391
#
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
403392
- source:
404393
kind: ConfigMap
405394
name: service-values
@@ -428,7 +417,7 @@ replacements:
428417
- source:
429418
kind: ConfigMap
430419
name: service-values
431-
fieldPath: data.telemetry.metricStorage
420+
fieldPath: data.telemetry.template.metricStorage
432421
targets:
433422
- select:
434423
kind: OpenStackControlPlane
@@ -439,7 +428,7 @@ replacements:
439428
- source:
440429
kind: ConfigMap
441430
name: service-values
442-
fieldPath: data.telemetry.autoscaling.enabled
431+
fieldPath: data.telemetry.template.autoscaling.enabled
443432
targets:
444433
- select:
445434
kind: OpenStackControlPlane
@@ -450,7 +439,7 @@ replacements:
450439
- source:
451440
kind: ConfigMap
452441
name: service-values
453-
fieldPath: data.telemetry.ceilometer.enabled
442+
fieldPath: data.telemetry.template.ceilometer.enabled
454443
targets:
455444
- select:
456445
kind: OpenStackControlPlane

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

0 commit comments

Comments
 (0)