Skip to content

Commit 3455dae

Browse files
lmiccinilmiccini
committed
migrate to new params each service
1 parent c1f1bae commit 3455dae

41 files changed

Lines changed: 414 additions & 221 deletions

Some content is hidden

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

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,6 @@ spec:
543543
default: false
544544
type: boolean
545545
rabbitMqClusterName:
546-
default: rabbitmq
547546
type: string
548547
secret:
549548
default: osp-secret
@@ -568,7 +567,6 @@ spec:
568567
- barbicanKeystoneListener
569568
- barbicanWorker
570569
- databaseInstance
571-
- rabbitMqClusterName
572570
- serviceAccount
573571
type: object
574572
type: object
@@ -1663,7 +1661,6 @@ spec:
16631661
default: false
16641662
type: boolean
16651663
rabbitMqClusterName:
1666-
default: rabbitmq
16671664
type: string
16681665
secret:
16691666
type: string
@@ -1682,7 +1679,6 @@ spec:
16821679
- cinderScheduler
16831680
- databaseInstance
16841681
- memcachedInstance
1685-
- rabbitMqClusterName
16861682
- secret
16871683
type: object
16881684
uniquePodNames:
@@ -2825,7 +2821,6 @@ spec:
28252821
default: false
28262822
type: boolean
28272823
rabbitMqClusterName:
2828-
default: rabbitmq
28292824
type: string
28302825
redisServiceName:
28312826
default: designate-redis
@@ -2883,7 +2878,6 @@ spec:
28832878
- designateMdns
28842879
- designateProducer
28852880
- designateWorker
2886-
- rabbitMqClusterName
28872881
- secret
28882882
type: object
28892883
type: object
@@ -5701,7 +5695,6 @@ spec:
57015695
default: false
57025696
type: boolean
57035697
rabbitMqClusterName:
5704-
default: rabbitmq
57055698
type: string
57065699
rabbitmq:
57075700
properties:
@@ -5733,7 +5726,6 @@ spec:
57335726
- heatCfnAPI
57345727
- heatEngine
57355728
- memcachedInstance
5736-
- rabbitMqClusterName
57375729
- secret
57385730
type: object
57395731
type: object
@@ -8142,7 +8134,6 @@ spec:
81428134
default: false
81438135
type: boolean
81448136
rabbitMqClusterName:
8145-
default: rabbitmq
81468137
type: string
81478138
region:
81488139
default: regionOne
@@ -8225,7 +8216,6 @@ spec:
82258216
required:
82268217
- databaseInstance
82278218
- memcachedInstance
8228-
- rabbitMqClusterName
82298219
- secret
82308220
type: object
82318221
type: object
@@ -9206,7 +9196,6 @@ spec:
92069196
default: false
92079197
type: boolean
92089198
rabbitMqClusterName:
9209-
default: rabbitmq
92109199
type: string
92119200
secret:
92129201
type: string
@@ -9225,7 +9214,6 @@ spec:
92259214
- manilaAPI
92269215
- manilaScheduler
92279216
- memcachedInstance
9228-
- rabbitMqClusterName
92299217
type: object
92309218
type: object
92319219
memcached:
@@ -10085,7 +10073,6 @@ spec:
1008510073
default: false
1008610074
type: boolean
1008710075
rabbitMqClusterName:
10088-
default: rabbitmq
1008910076
type: string
1009010077
replicas:
1009110078
default: 1
@@ -10164,7 +10151,6 @@ spec:
1016410151
required:
1016510152
- databaseInstance
1016610153
- memcachedInstance
10167-
- rabbitMqClusterName
1016810154
- secret
1016910155
type: object
1017010156
type: object
@@ -10454,7 +10440,6 @@ spec:
1045410440
default: openstack
1045510441
type: string
1045610442
apiMessageBusInstance:
10457-
default: rabbitmq
1045810443
type: string
1045910444
apiServiceTemplate:
1046010445
default:
@@ -10604,7 +10589,6 @@ spec:
1060410589
default: openstack
1060510590
type: string
1060610591
cellMessageBusInstance:
10607-
default: rabbitmq
1060810592
type: string
1060910593
conductorServiceTemplate:
1061010594
properties:
@@ -11035,8 +11019,9 @@ spec:
1103511019
cell1:
1103611020
cellDatabaseAccount: nova-cell1
1103711021
cellDatabaseInstance: openstack-cell1
11038-
cellMessageBusInstance: rabbitmq-cell1
1103911022
hasAPIAccess: true
11023+
messagingBus:
11024+
cluster: rabbitmq-cell1
1104011025
type: object
1104111026
keystoneInstance:
1104211027
default: keystone
@@ -12285,7 +12270,6 @@ spec:
1228512270
default: false
1228612271
type: boolean
1228712272
rabbitMqClusterName:
12288-
default: rabbitmq
1228912273
type: string
1229012274
redisServiceName:
1229112275
default: octavia-redis
@@ -12352,7 +12336,6 @@ spec:
1235212336
- databaseInstance
1235312337
- octaviaAPI
1235412338
- octaviaNetworkAttachment
12355-
- rabbitMqClusterName
1235612339
- secret
1235712340
type: object
1235812341
type: object
@@ -14182,6 +14165,18 @@ spec:
1418214165
additionalProperties:
1418314166
type: string
1418414167
type: object
14168+
notificationsBus:
14169+
properties:
14170+
cluster:
14171+
minLength: 1
14172+
type: string
14173+
user:
14174+
type: string
14175+
vhost:
14176+
type: string
14177+
required:
14178+
- cluster
14179+
type: object
1418514180
override:
1418614181
properties:
1418714182
service:
@@ -14243,7 +14238,6 @@ spec:
1424314238
type: string
1424414239
type: object
1424514240
rabbitMqClusterName:
14246-
default: rabbitmq
1424714241
type: string
1424814242
replicas:
1424914243
default: 1
@@ -14290,7 +14284,6 @@ spec:
1429014284
type: object
1429114285
required:
1429214286
- memcachedInstance
14293-
- rabbitMqClusterName
1429414287
- replicas
1429514288
- secret
1429614289
- serviceUser
@@ -15493,7 +15486,6 @@ spec:
1549315486
type: object
1549415487
x-kubernetes-map-type: atomic
1549515488
rabbitMqClusterName:
15496-
default: rabbitmq
1549715489
type: string
1549815490
s3StorageConfig:
1549915491
default:
@@ -16911,7 +16903,6 @@ spec:
1691116903
default: metric-storage-prometheus-endpoint
1691216904
type: string
1691316905
rabbitMqClusterName:
16914-
default: rabbitmq
1691516906
type: string
1691616907
secret:
1691716908
default: osp-secret
@@ -16931,7 +16922,6 @@ spec:
1693116922
- applierServiceTemplate
1693216923
- databaseInstance
1693316924
- decisionengineServiceTemplate
16934-
- rabbitMqClusterName
1693516925
type: object
1693616926
type: object
1693716927
required:

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,15 @@ func (r *OpenStackControlPlane) DefaultServices() {
10451045
if r.Spec.Nova.Template.MessagingBus.Cluster == "" {
10461046
r.Spec.Nova.Template.MessagingBus.Cluster = "rabbitmq"
10471047
}
1048+
// Set default MessagingBus.Cluster for each cell if not specified
1049+
if r.Spec.Nova.Template.CellTemplates != nil {
1050+
for cellName, cellTemplate := range r.Spec.Nova.Template.CellTemplates {
1051+
if cellTemplate.MessagingBus.Cluster == "" {
1052+
cellTemplate.MessagingBus.Cluster = "rabbitmq"
1053+
r.Spec.Nova.Template.CellTemplates[cellName] = cellTemplate
1054+
}
1055+
}
1056+
}
10481057
// NotificationsBus propagation is handled in the reconcile loop to properly support
10491058
// both inheritance and clearing. The webhook doesn't have access to the old object
10501059
// to distinguish between user overrides and inherited values.

‎api/go.mod‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,30 @@ replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144144

145145
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
146146

147-
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260128143030-6e2c19a0954f
147+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260129115901-ec49646f454d
148148

149-
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260128143047-7e5a34a93442
149+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260129115434-72599ec8b0eb
150150

151-
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260128143100-db65ae8f43cc
151+
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260129120125-f724aa20f57f
152152

153-
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260128144034-ac88c150a375
153+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260129121109-7acdaf900d61
154154

155-
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260128143213-fa78779535d8
155+
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260129120621-5a1c0c25f66d
156156

157-
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260128143237-ea4543df3248
157+
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260129120750-2bcbec3adfa7
158158

159-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260128165211-2f29d34114a0
159+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260129142446-160e481fd139
160160

161-
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260128143259-389cebc83319
161+
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260129125945-e216361521f4
162162

163-
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260128143313-042d4ad8378e
163+
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260129121503-0aa4d06499c1
164164

165-
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260127121731-30194218c620
165+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260129134601-7c1ae7633f35
166166

167-
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260129041150-3641c8995c61
167+
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260129123115-7d5093f00dca
168168

169-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260129024318-6c13b4fe5133
169+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/lmiccini/swift-operator/api v0.0.0-20260129111939-21099018aab1
170170

171-
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260127173458-8b30c5e7d456
171+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260129121935-22f0adde14e4
172+
173+
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260129123402-744760956f20

0 commit comments

Comments
 (0)