Skip to content

Commit 33b7fa9

Browse files
stuggigibizer
authored andcommitted
[kuttl] change cellDatabaseUser to in the collapsed cell test
The cellDatabaseUser field is replaced with the cellDatabaseAccount. Most of the sample and kuttl test assert files does not define the cellTemplates and therefore they are defaulted by nova-operator. However in the collapsed cell sample we need to finetune the cell template fields and therefore some of the cellTemplate fields are explicitly defined. However if at least one of the field is defined then the struct level defaulting does not triggered, so the rest of the fields needs to be define too, otherwise we get the golang default values. This patch makes sure that cellDatabaseAccount field is defined in the samples where we explicitly define cellTemplates.
1 parent c4228a3 commit 33b7fa9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ spec:
9595
# separation implemented.
9696
cellTemplates:
9797
cell0:
98-
cellDatabaseUser: nova_cell0
98+
cellDatabaseAccount: nova-cell0
9999
conductorServiceTemplate:
100100
replicas: 0
101101
hasAPIAccess: true
102102
cell1:
103-
cellDatabaseUser: nova_cell1
103+
cellDatabaseAccount: nova-cell1
104104
cellDatabaseInstance: openstack
105105
cellMessageBusInstance: rabbitmq
106106
conductorServiceTemplate:

tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ spec:
7777
# separation implemented.
7878
cellTemplates:
7979
cell0:
80-
cellDatabaseUser: nova_cell0
80+
cellDatabaseAccount: nova-cell0
8181
conductorServiceTemplate:
8282
replicas: 0
8383
hasAPIAccess: true
8484
cell1:
85-
cellDatabaseUser: nova_cell1
85+
cellDatabaseAccount: nova-cell1
8686
cellDatabaseInstance: openstack
8787
cellMessageBusInstance: rabbitmq
8888
conductorServiceTemplate:

0 commit comments

Comments
 (0)