Skip to content

Commit 50459b1

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 50459b1

File tree

60 files changed

+497
-340
lines changed

Some content is hidden

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

60 files changed

+497
-340
lines changed

dt/dcn/control-plane/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ replacements:
5858
- source:
5959
kind: ConfigMap
6060
name: service-values
61-
fieldPath: data.neutron.template.customServiceConfig
61+
fieldPath: data.neutron.customServiceConfig
6262
targets:
6363
- select:
6464
kind: OpenStackControlPlane
@@ -69,7 +69,7 @@ replacements:
6969
- source:
7070
kind: ConfigMap
7171
name: service-values
72-
fieldPath: data.ovn.template.ovnController.external-ids
72+
fieldPath: data.ovn.ovnController.external-ids
7373
targets:
7474
- select:
7575
kind: OpenStackControlPlane
@@ -80,7 +80,7 @@ replacements:
8080
- source:
8181
kind: ConfigMap
8282
name: service-values
83-
fieldPath: data.ovn.template.ovnController.nicMappings
83+
fieldPath: data.ovn.ovnController.nicMappings
8484
targets:
8585
- select:
8686
kind: OpenStackControlPlane

dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane-pre-ceph/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ replacements:
110110
- source:
111111
kind: ConfigMap
112112
name: service-values
113-
fieldPath: data.telemetry.template.ceilometer.enabled
113+
fieldPath: data.telemetry.ceilometer.enabled
114114
targets:
115115
- select:
116116
kind: OpenStackControlPlane

dt/nova/nova-three-cells/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ replacements:
8181
- source:
8282
kind: ConfigMap
8383
name: service-values
84-
fieldPath: data.telemetry.template.ceilometer.enabled
84+
fieldPath: data.telemetry.ceilometer.enabled
8585
targets:
8686
- select:
8787
kind: OpenStackControlPlane
@@ -125,7 +125,7 @@ replacements:
125125
- source:
126126
kind: ConfigMap
127127
name: service-values
128-
fieldPath: data.nova.template.cellTemplates.cell2
128+
fieldPath: data.nova.cellTemplates.cell2
129129
targets:
130130
- select:
131131
kind: OpenStackControlPlane

dt/perfscale/scalelab/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ replacements:
7777
- source:
7878
kind: ConfigMap
7979
name: service-values
80-
fieldPath: data.telemetry.template.ceilometer.enabled
80+
fieldPath: data.telemetry.ceilometer.enabled
8181
targets:
8282
- select:
8383
kind: OpenStackControlPlane
@@ -88,7 +88,7 @@ replacements:
8888
- source:
8989
kind: ConfigMap
9090
name: service-values
91-
fieldPath: data.telemetry.template.metricStorage.enabled
91+
fieldPath: data.telemetry.metricStorage.enabled
9292
targets:
9393
- select:
9494
kind: OpenStackControlPlane
@@ -97,7 +97,7 @@ replacements:
9797
- source:
9898
kind: ConfigMap
9999
name: service-values
100-
fieldPath: data.telemetry.template.metricStorage.dataplaneNetwork
100+
fieldPath: data.telemetry.metricStorage.dataplaneNetwork
101101
targets:
102102
- select:
103103
kind: OpenStackControlPlane
@@ -108,7 +108,7 @@ replacements:
108108
- source:
109109
kind: ConfigMap
110110
name: service-values
111-
fieldPath: data.telemetry.template.metricStorage.networkAttachments
111+
fieldPath: data.telemetry.metricStorage.networkAttachments
112112
targets:
113113
- select:
114114
kind: OpenStackControlPlane

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ replacements:
263263
- source:
264264
kind: ConfigMap
265265
name: service-values
266-
fieldPath: data.nova.template.cellTemplates.cell2
266+
fieldPath: data.nova.cellTemplates.cell2
267267
targets:
268268
- select:
269269
kind: OpenStackControlPlane
@@ -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

dt/uni05epsilon/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ replacements:
7171
- source:
7272
kind: ConfigMap
7373
name: service-values
74-
fieldPath: data.nova.template.cellTemplates.cell2
74+
fieldPath: data.nova.cellTemplates.cell2
7575
targets:
7676
- select:
7777
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

0 commit comments

Comments
 (0)