Skip to content

Commit 204438a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #829 from SeanMooney/encode-default-cell-templates
update config samples to include default cell template
2 parents 6fe60e7 + 478ee25 commit 204438a

9 files changed

+135
-0
lines changed

‎config/samples/core_v1beta1_openstackcontrolplane.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,21 @@ spec:
109109
secret: osp-secret
110110
nova:
111111
template:
112+
cellTemplates:
113+
cell0:
114+
cellDatabaseAccount: nova-cell0
115+
cellDatabaseInstance: openstack
116+
cellMessageBusInstance: rabbitmq
117+
conductorServiceTemplate:
118+
replicas: 1
119+
hasAPIAccess: true
120+
cell1:
121+
cellDatabaseAccount: nova-cell1
122+
cellDatabaseInstance: openstack-cell1
123+
cellMessageBusInstance: rabbitmq-cell1
124+
conductorServiceTemplate:
125+
replicas: 1
126+
hasAPIAccess: true
112127
secret: osp-secret
113128
heat:
114129
enabled: false

‎config/samples/core_v1beta1_openstackcontrolplane_galera.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,21 @@ spec:
108108
nova:
109109
template:
110110
secret: osp-secret
111+
cellTemplates:
112+
cell0:
113+
cellDatabaseAccount: nova-cell0
114+
cellDatabaseInstance: openstack
115+
cellMessageBusInstance: rabbitmq
116+
conductorServiceTemplate:
117+
replicas: 1
118+
hasAPIAccess: true
119+
cell1:
120+
cellDatabaseAccount: nova-cell1
121+
cellDatabaseInstance: openstack-cell1
122+
cellMessageBusInstance: rabbitmq-cell1
123+
conductorServiceTemplate:
124+
replicas: 1
125+
hasAPIAccess: true
111126
heat:
112127
enabled: false
113128
template:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,21 @@ spec:
108108
nova:
109109
template:
110110
secret: osp-secret
111+
cellTemplates:
112+
cell0:
113+
cellDatabaseAccount: nova-cell0
114+
cellDatabaseInstance: openstack
115+
cellMessageBusInstance: rabbitmq
116+
conductorServiceTemplate:
117+
replicas: 1
118+
hasAPIAccess: true
119+
cell1:
120+
cellDatabaseAccount: nova-cell1
121+
cellDatabaseInstance: openstack-cell1
122+
cellMessageBusInstance: rabbitmq-cell1
123+
conductorServiceTemplate:
124+
replicas: 1
125+
hasAPIAccess: true
111126
ironic:
112127
template:
113128
databaseInstance: openstack

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,21 @@ spec:
155155
apiOverride:
156156
route: {}
157157
template:
158+
cellTemplates:
159+
cell0:
160+
cellDatabaseAccount: nova-cell0
161+
cellDatabaseInstance: openstack
162+
cellMessageBusInstance: rabbitmq
163+
conductorServiceTemplate:
164+
replicas: 1
165+
hasAPIAccess: true
166+
cell1:
167+
cellDatabaseAccount: nova-cell1
168+
cellDatabaseInstance: openstack-cell1
169+
cellMessageBusInstance: rabbitmq-cell1
170+
conductorServiceTemplate:
171+
replicas: 1
172+
hasAPIAccess: true
158173
apiServiceTemplate:
159174
override:
160175
service:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,21 @@ spec:
155155
apiOverride:
156156
route: {}
157157
template:
158+
cellTemplates:
159+
cell0:
160+
cellDatabaseAccount: nova-cell0
161+
cellDatabaseInstance: openstack
162+
cellMessageBusInstance: rabbitmq
163+
conductorServiceTemplate:
164+
replicas: 1
165+
hasAPIAccess: true
166+
cell1:
167+
cellDatabaseAccount: nova-cell1
168+
cellDatabaseInstance: openstack-cell1
169+
cellMessageBusInstance: rabbitmq-cell1
170+
conductorServiceTemplate:
171+
replicas: 1
172+
hasAPIAccess: true
158173
apiServiceTemplate:
159174
override:
160175
service:

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,21 @@ spec:
149149
apiOverride:
150150
route: {}
151151
template:
152+
cellTemplates:
153+
cell0:
154+
cellDatabaseAccount: nova-cell0
155+
cellDatabaseInstance: openstack
156+
cellMessageBusInstance: rabbitmq
157+
conductorServiceTemplate:
158+
replicas: 1
159+
hasAPIAccess: true
160+
cell1:
161+
cellDatabaseAccount: nova-cell1
162+
cellDatabaseInstance: openstack-cell1
163+
cellMessageBusInstance: rabbitmq-cell1
164+
conductorServiceTemplate:
165+
replicas: 1
166+
hasAPIAccess: true
152167
apiServiceTemplate:
153168
override:
154169
service:

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,21 @@ spec:
151151
apiOverride:
152152
route: {}
153153
template:
154+
cellTemplates:
155+
cell0:
156+
cellDatabaseAccount: nova-cell0
157+
cellDatabaseInstance: openstack
158+
cellMessageBusInstance: rabbitmq
159+
conductorServiceTemplate:
160+
replicas: 1
161+
hasAPIAccess: true
162+
cell1:
163+
cellDatabaseAccount: nova-cell1
164+
cellDatabaseInstance: openstack-cell1
165+
cellMessageBusInstance: rabbitmq-cell1
166+
conductorServiceTemplate:
167+
replicas: 1
168+
hasAPIAccess: true
154169
apiServiceTemplate:
155170
override:
156171
service:

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,21 @@ spec:
195195
apiOverride:
196196
route: {}
197197
template:
198+
cellTemplates:
199+
cell0:
200+
cellDatabaseAccount: nova-cell0
201+
cellDatabaseInstance: openstack
202+
cellMessageBusInstance: rabbitmq
203+
conductorServiceTemplate:
204+
replicas: 1
205+
hasAPIAccess: true
206+
cell1:
207+
cellDatabaseAccount: nova-cell1
208+
cellDatabaseInstance: openstack-cell1
209+
cellMessageBusInstance: rabbitmq-cell1
210+
conductorServiceTemplate:
211+
replicas: 1
212+
hasAPIAccess: true
198213
apiServiceTemplate:
199214
override:
200215
service:

‎config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,21 @@ spec:
154154
apiOverride:
155155
route: {}
156156
template:
157+
cellTemplates:
158+
cell0:
159+
cellDatabaseAccount: nova-cell0
160+
cellDatabaseInstance: openstack
161+
cellMessageBusInstance: rabbitmq
162+
conductorServiceTemplate:
163+
replicas: 1
164+
hasAPIAccess: true
165+
cell1:
166+
cellDatabaseAccount: nova-cell1
167+
cellDatabaseInstance: openstack-cell1
168+
cellMessageBusInstance: rabbitmq-cell1
169+
conductorServiceTemplate:
170+
replicas: 1
171+
hasAPIAccess: true
157172
apiServiceTemplate:
158173
override:
159174
service:

0 commit comments

Comments
 (0)