Skip to content

Commit

Permalink
[kuttl] change cellDatabaseUser to in the collapsed cell test
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
stuggi authored and gibizer committed Mar 8, 2024
1 parent c4228a3 commit 33b7fa9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ spec:
# separation implemented.
cellTemplates:
cell0:
cellDatabaseUser: nova_cell0
cellDatabaseAccount: nova-cell0
conductorServiceTemplate:
replicas: 0
hasAPIAccess: true
cell1:
cellDatabaseUser: nova_cell1
cellDatabaseAccount: nova-cell1
cellDatabaseInstance: openstack
cellMessageBusInstance: rabbitmq
conductorServiceTemplate:
Expand Down
4 changes: 2 additions & 2 deletions tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ spec:
# separation implemented.
cellTemplates:
cell0:
cellDatabaseUser: nova_cell0
cellDatabaseAccount: nova-cell0
conductorServiceTemplate:
replicas: 0
hasAPIAccess: true
cell1:
cellDatabaseUser: nova_cell1
cellDatabaseAccount: nova-cell1
cellDatabaseInstance: openstack
cellMessageBusInstance: rabbitmq
conductorServiceTemplate:
Expand Down

0 comments on commit 33b7fa9

Please sign in to comment.