Skip to content

Commit a2e6c6a

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request openstack-k8s-operators#73 from karelyatin/update_crd
Update crd with latest keystone/placement updates
2 parents f7f9c39 + 49b169d commit a2e6c6a

File tree

3 files changed

+143
-98
lines changed

3 files changed

+143
-98
lines changed

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

Lines changed: 70 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -152,24 +152,21 @@ spec:
152152
for running the API service
153153
type: object
154154
passwordSelectors:
155+
default:
156+
database: CinderDatabasePassword
157+
service: CinderPassword
155158
description: PasswordSelectors - Selectors to identify
156-
the DB and AdminUser password and TransportURL from
157-
the Secret
159+
the DB and ServiceUser password from the Secret
158160
properties:
159-
admin:
160-
default: CinderPassword
161-
description: Database - Selector to get the cinder
162-
service password from the Secret
163-
type: string
164161
database:
165162
default: CinderDatabasePassword
166163
description: 'Database - Selector to get the cinder
167164
database user password from the Secret TODO: not
168165
used, need change in mariadb-operator'
169166
type: string
170-
transportUrl:
171-
default: TransportURL
172-
description: Database - Selector to get the cinder
167+
service:
168+
default: CinderPassword
169+
description: Service - Selector to get the cinder
173170
service password from the Secret
174171
type: string
175172
type: object
@@ -215,6 +212,9 @@ spec:
215212
description: ServiceUser - optional username used for
216213
this service to register in cinder
217214
type: string
215+
transportURLSecret:
216+
description: Secret containing RabbitMq transport URL
217+
type: string
218218
type: object
219219
cinderBackup:
220220
description: CinderBackup - Spec definition for the Backup
@@ -272,23 +272,21 @@ spec:
272272
for running the Backup service
273273
type: object
274274
passwordSelectors:
275+
default:
276+
database: CinderDatabasePassword
277+
service: CinderPassword
275278
description: PasswordSelectors - Selectors to identify
276-
the DB and TransportURL from the Secret
279+
the DB and ServiceUser password from the Secret
277280
properties:
278-
admin:
279-
default: CinderPassword
280-
description: Database - Selector to get the cinder
281-
service password from the Secret
282-
type: string
283281
database:
284282
default: CinderDatabasePassword
285283
description: 'Database - Selector to get the cinder
286284
database user password from the Secret TODO: not
287285
used, need change in mariadb-operator'
288286
type: string
289-
transportUrl:
290-
default: TransportURL
291-
description: Database - Selector to get the cinder
287+
service:
288+
default: CinderPassword
289+
description: Service - Selector to get the cinder
292290
service password from the Secret
293291
type: string
294292
type: object
@@ -333,6 +331,9 @@ spec:
333331
description: ServiceUser - optional username used for
334332
this service to register in cinder
335333
type: string
334+
transportURLSecret:
335+
description: Secret containing RabbitMq transport URL
336+
type: string
336337
type: object
337338
cinderScheduler:
338339
description: CinderScheduler - Spec definition for the Scheduler
@@ -390,23 +391,21 @@ spec:
390391
for running the Scheduler service
391392
type: object
392393
passwordSelectors:
394+
default:
395+
database: CinderDatabasePassword
396+
service: CinderPassword
393397
description: PasswordSelectors - Selectors to identify
394-
the DB and TransportURL from the Secret
398+
the DB and ServiceUser password from the Secret
395399
properties:
396-
admin:
397-
default: CinderPassword
398-
description: Database - Selector to get the cinder
399-
service password from the Secret
400-
type: string
401400
database:
402401
default: CinderDatabasePassword
403402
description: 'Database - Selector to get the cinder
404403
database user password from the Secret TODO: not
405404
used, need change in mariadb-operator'
406405
type: string
407-
transportUrl:
408-
default: TransportURL
409-
description: Database - Selector to get the cinder
406+
service:
407+
default: CinderPassword
408+
description: Service - Selector to get the cinder
410409
service password from the Secret
411410
type: string
412411
type: object
@@ -452,6 +451,9 @@ spec:
452451
description: ServiceUser - optional username used for
453452
this service to register in cinder
454453
type: string
454+
transportURLSecret:
455+
description: Secret containing RabbitMq transport URL
456+
type: string
455457
type: object
456458
cinderVolumes:
457459
additionalProperties:
@@ -510,23 +512,21 @@ spec:
510512
nodes for running the Volume service
511513
type: object
512514
passwordSelectors:
515+
default:
516+
database: CinderDatabasePassword
517+
service: CinderPassword
513518
description: PasswordSelectors - Selectors to identify
514-
the DB and TransportURL from the Secret
519+
the DB and ServiceUser password from the Secret
515520
properties:
516-
admin:
517-
default: CinderPassword
518-
description: Database - Selector to get the cinder
519-
service password from the Secret
520-
type: string
521521
database:
522522
default: CinderDatabasePassword
523523
description: 'Database - Selector to get the cinder
524524
database user password from the Secret TODO: not
525525
used, need change in mariadb-operator'
526526
type: string
527-
transportUrl:
528-
default: TransportURL
529-
description: Database - Selector to get the cinder
527+
service:
528+
default: CinderPassword
529+
description: Service - Selector to get the cinder
530530
service password from the Secret
531531
type: string
532532
type: object
@@ -573,6 +573,9 @@ spec:
573573
description: ServiceUser - optional username used for
574574
this service to register in cinder
575575
type: string
576+
transportURLSecret:
577+
description: Secret containing RabbitMq transport URL
578+
type: string
576579
type: object
577580
description: CinderVolumes - Map of chosen names to spec definitions
578581
for the Volume(s) service(s) of this Cinder deployment
@@ -620,23 +623,21 @@ spec:
620623
config dir in /etc/<service> . TODO: -> implement'
621624
type: object
622625
passwordSelectors:
626+
default:
627+
database: CinderDatabasePassword
628+
service: CinderPassword
623629
description: PasswordSelectors - Selectors to identify the
624-
DB and AdminUser password and TransportURL from the Secret
630+
DB and ServiceUser password from the Secret
625631
properties:
626-
admin:
627-
default: CinderPassword
628-
description: Database - Selector to get the cinder service
629-
password from the Secret
630-
type: string
631632
database:
632633
default: CinderDatabasePassword
633634
description: 'Database - Selector to get the cinder database
634635
user password from the Secret TODO: not used, need change
635636
in mariadb-operator'
636637
type: string
637-
transportUrl:
638-
default: TransportURL
639-
description: Database - Selector to get the cinder service
638+
service:
639+
default: CinderPassword
640+
description: Service - Selector to get the cinder service
640641
password from the Secret
641642
type: string
642643
type: object
@@ -645,9 +646,14 @@ spec:
645646
description: PreserveJobs - do not delete jobs after they
646647
finished e.g. to check logs
647648
type: boolean
649+
rabbitMqClusterName:
650+
default: rabbitmq
651+
description: RabbitMQ instance name Needed to request a transportURL
652+
that is created and used in Cinder
653+
type: string
648654
secret:
649655
description: Secret containing OpenStack password information
650-
for CinderDatabasePassword, AdminPassword
656+
for CinderDatabasePassword, CinderPassword
651657
type: string
652658
serviceUser:
653659
default: cinder
@@ -657,6 +663,7 @@ spec:
657663
required:
658664
- cinderAPI
659665
- cinderScheduler
666+
- rabbitMqClusterName
660667
type: object
661668
type: object
662669
glance:
@@ -1197,13 +1204,16 @@ spec:
11971204
running this service
11981205
type: object
11991206
passwordSelectors:
1207+
default:
1208+
admin: AdminPassword
1209+
database: KeystoneDatabasePassword
12001210
description: PasswordSelectors - Selectors to identify the
12011211
DB and AdminUser password from the Secret
12021212
properties:
12031213
admin:
12041214
default: AdminPassword
1205-
description: Database - Selector to get the keystone Database
1206-
user password from the Secret
1215+
description: Admin - Selector to get the keystone Admin
1216+
password from the Secret
12071217
type: string
12081218
database:
12091219
default: KeystoneDatabasePassword
@@ -1261,6 +1271,10 @@ spec:
12611271
description: Secret containing OpenStack password information
12621272
for keystone KeystoneDatabasePassword, AdminPassword
12631273
type: string
1274+
required:
1275+
- containerImage
1276+
- databaseInstance
1277+
- secret
12641278
type: object
12651279
type: object
12661280
mariadb:
@@ -1364,6 +1378,9 @@ spec:
13641378
running this service
13651379
type: object
13661380
passwordSelectors:
1381+
default:
1382+
database: PlacementDatabasePassword
1383+
service: PlacementPassword
13671384
description: PasswordSelectors - Selectors to identify the
13681385
DB and ServiceUser password from the Secret
13691386
properties:
@@ -1428,6 +1445,10 @@ spec:
14281445
description: ServiceUser - optional username used for this
14291446
service to register in keystone
14301447
type: string
1448+
required:
1449+
- containerImage
1450+
- databaseInstance
1451+
- secret
14311452
type: object
14321453
type: object
14331454
rabbitmq:

0 commit comments

Comments
 (0)