Skip to content

Commit 34b6a68

Browse files
committed
Remove apparently unneeded parameters
It seems cellMessageBusInstance as well as rabbitMqClusterName aren't valid, at least in those locations. This leads to some failures within ArgoCD, where the openstack-controlplane application doesn't converge properly, showing the following persistent diff: ``` $ argocd --grpc-web app diff openshift-gitops/cifmw-demo-controlplane ===== core.openstack.org/OpenStackControlPlane openstack/openstack-control-plane ====== 1187a1188 > cellMessageBusInstance: rabbitmq 1218a1220 > cellMessageBusInstance: rabbitmq-cell1 1533a1536 > rabbitMqClusterName: rabbitmq ``` This is mostly reflecting a change that happened in the openstack-k8s-operators/architecture repository: openstack-k8s-operators/architecture#694
1 parent becfcb5 commit 34b6a68

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

components/rhoso/controlplane/controlplane/openstack-controlplane.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,10 @@ spec:
7070
cell0:
7171
cellDatabaseAccount: nova-cell0
7272
cellDatabaseInstance: openstack
73-
cellMessageBusInstance: rabbitmq
7473
hasAPIAccess: true
7574
cell1:
7675
cellDatabaseAccount: nova-cell1
7776
cellDatabaseInstance: openstack-cell1
78-
cellMessageBusInstance: rabbitmq-cell1
7977
noVNCProxyServiceTemplate:
8078
enabled: true
8179
networkAttachments:
@@ -302,7 +300,6 @@ spec:
302300
databaseInstance: openstack
303301
passwordSelector:
304302
aodhService: AodhPassword
305-
rabbitMqClusterName: rabbitmq
306303
serviceUser: aodh
307304
secret: osp-secret
308305
heatInstance: heat

0 commit comments

Comments
 (0)