Skip to content

Commit 44608a4

Browse files
softwarefactory-project-zuul[bot]softwarefactory-project-zuul[bot]
authored
Merge pull request #447 from jamepark4/add_3cells_uni-epsilon
Add 3cells to uni05 epsilon Update uni05-epsilon to deploy with 3 cells instead of the standard two cell deployment. Depends-On: openstack-k8s-operators/ci-framework#2545 Reviewed-by: Bogdan Dobrelya Reviewed-by: Balazs Gibizer <[email protected]> Reviewed-by: jamepark4 <[email protected]> Reviewed-by: Andrew Bays <[email protected]>
2 parents e5a762d + ed07cc0 commit 44608a4

File tree

23 files changed

+666
-17
lines changed

23 files changed

+666
-17
lines changed

‎automation/vars/uni05epsilon.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ vas:
4040
src_file: values.yaml
4141
build_output: nodeset-pre-ceph.yaml
4242

43+
- path: examples/dt/uni05epsilon/nodeset2/edpm-pre-ceph
44+
wait_conditions:
45+
- >-
46+
oc -n openstack wait osdpns
47+
openstack-edpm-2
48+
--for condition=SetupReady
49+
--timeout=10m
50+
values:
51+
- name: edpm-nodeset2-values
52+
src_file: values.yaml
53+
build_output: nodeset2-pre-ceph.yaml
54+
4355
- path: examples/dt/uni05epsilon/edpm-pre-ceph/deployment
4456
wait_conditions:
4557
- >-
@@ -71,6 +83,18 @@ vas:
7183
src_file: values.yaml
7284
build_output: nodeset-post-ceph.yaml
7385

86+
- path: examples/dt/uni05epsilon/nodeset2
87+
wait_conditions:
88+
- >-
89+
oc -n openstack wait osdpns
90+
openstack-edpm-2
91+
--for condition=SetupReady
92+
--timeout=10m
93+
values:
94+
- name: edpm-nodeset2-values-post-ceph
95+
src_file: values.yaml
96+
build_output: nodeset2-post-ceph.yaml
97+
7498
- path: examples/dt/uni05epsilon/deployment
7599
wait_conditions:
76100
- >-
@@ -82,3 +106,15 @@ vas:
82106
- name: edpm-deployment-values-post-ceph
83107
src_file: values.yaml
84108
build_output: deployment-post-ceph.yaml
109+
110+
- path: examples/dt/uni05epsilon/nodeset2/deployment
111+
wait_conditions:
112+
- >-
113+
oc -n openstack wait osdpd
114+
edpm-deployment-post-ceph-2
115+
--for condition=Ready
116+
--timeout=40m
117+
values:
118+
- name: edpm-deployment-values-post-ceph-2
119+
src_file: values.yaml
120+
build_output: deployment-post-ceph-2.yaml

‎dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,66 @@ replacements:
212212
options:
213213
create: true
214214

215+
- source:
216+
kind: ConfigMap
217+
name: service-values
218+
fieldPath: data.galera.templates.openstack-cell2
219+
targets:
220+
- select:
221+
kind: OpenStackControlPlane
222+
fieldPaths:
223+
- spec.galera.templates.openstack-cell2
224+
options:
225+
create: true
226+
227+
- source:
228+
kind: ConfigMap
229+
name: network-values
230+
fieldPath: data.rabbitmq-cell2.endpoint_annotations
231+
targets:
232+
- select:
233+
kind: OpenStackControlPlane
234+
fieldPaths:
235+
- spec.rabbitmq.templates.rabbitmq-cell2.override.service.metadata.annotations
236+
options:
237+
create: true
238+
239+
- source:
240+
kind: ConfigMap
241+
name: service-values
242+
fieldPath: data.rabbitmq.templates.rabbitmq-cell2.replicas
243+
targets:
244+
- select:
245+
kind: OpenStackControlPlane
246+
fieldPaths:
247+
- spec.rabbitmq.templates.rabbitmq-cell2.replicas
248+
options:
249+
create: true
250+
251+
- source:
252+
kind: ConfigMap
253+
name: network-values
254+
fieldPath: data.lbServiceType
255+
targets:
256+
- select:
257+
kind: OpenStackControlPlane
258+
fieldPaths:
259+
- spec.rabbitmq.templates.rabbitmq-cell2.override.service.spec.type
260+
options:
261+
create: true
262+
263+
- source:
264+
kind: ConfigMap
265+
name: service-values
266+
fieldPath: data.nova.template.cellTemplates.cell2
267+
targets:
268+
- select:
269+
kind: OpenStackControlPlane
270+
fieldPaths:
271+
- spec.nova.template.cellTemplates.cell2
272+
options:
273+
create: true
274+
215275
#
216276
# Dataplane services override
217277
#

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/deployment/kustomization.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
transformers:
6+
- |-
7+
apiVersion: builtin
8+
kind: NamespaceTransformer
9+
metadata:
10+
name: _ignored_
11+
namespace: openstack
12+
setRoleBindingSubjects: none
13+
unsetOnly: true
14+
fieldSpecs:
15+
- path: metadata/name
16+
kind: Namespace
17+
create: true
18+
19+
components:
20+
- ../../../../../lib/dataplane/deployment
21+
22+
replacements:
23+
- source:
24+
kind: ConfigMap
25+
name: edpm-deployment-values-post-ceph-2
26+
fieldPath: data.deployment.name
27+
targets:
28+
- select:
29+
kind: OpenStackDataPlaneDeployment
30+
fieldPaths:
31+
- metadata.name
32+
options:
33+
create: true

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/kustomization.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
transformers:
6+
- |-
7+
apiVersion: builtin
8+
kind: NamespaceTransformer
9+
metadata:
10+
name: _ignored_
11+
namespace: openstack
12+
setRoleBindingSubjects: none
13+
unsetOnly: true
14+
fieldSpecs:
15+
- path: metadata/name
16+
kind: Namespace
17+
create: true
18+
19+
components:
20+
- ../../../../lib/dataplane/nodeset
21+
22+
patches:
23+
- target:
24+
kind: OpenStackDataPlaneNodeSet
25+
name: .*
26+
path: resources/ceph-extra-mounts.yaml
27+
28+
resources:
29+
- resources/nova-custom-config.yaml
30+
- resources/nova-custom-service.yaml
31+
32+
replacements:
33+
#
34+
# Dataplane services override
35+
#
36+
# (overrides /lib/dataplane which is using edpm-nodeset-values ConfigMap)
37+
#
38+
- source:
39+
kind: ConfigMap
40+
name: edpm-nodeset2-values-post-ceph
41+
fieldPath: data.nodeset.services
42+
targets:
43+
- select:
44+
kind: OpenStackDataPlaneNodeSet
45+
fieldPaths:
46+
- spec.services
47+
options:
48+
create: true

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/ceph-extra-mounts.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
apiVersion: dataplane.openstack.org/v1beta1
3+
kind: OpenStackDataPlaneNodeSet
4+
metadata:
5+
name: openstack-edpm
6+
spec:
7+
nodeTemplate:
8+
extraMounts:
9+
- extraVolType: Ceph
10+
mounts:
11+
- mountPath: /etc/ceph
12+
name: ceph
13+
readOnly: true
14+
volumes:
15+
- name: ceph
16+
secret:
17+
secretName: ceph-conf-files

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/ceph-secret.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
apiVersion: v1
3+
kind: Secret
4+
type: Opaque
5+
metadata:
6+
name: ceph-conf-files
7+
namespace: openstack
8+
data:
9+
ceph.client.openstack.keyring: _replaced_
10+
ceph.conf: _replaced_

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/cinder-volume-nfs-secrets.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
# Define the "cinder-volume-nfs-secrets" Secret that contains sensitive
3+
# information pertaining to the [nfs] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: cinder
9+
component: cinder-volume
10+
name: cinder-volume-nfs-secrets
11+
type: Opaque
12+
stringData:
13+
cinder-volume-nfs-secrets: _replaced_

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/cinder-volume-ontap-secrets.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
# Define the "cinder-volume-ontap-secrets" Secret that contains sensitive
3+
# information pertaining to the [ontap] backend.
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
labels:
8+
service: cinder
9+
component: cinder-volume
10+
name: cinder-volume-ontap-secrets
11+
type: Opaque
12+
stringData:
13+
cinder-volume-ontap-secrets: _replaced_

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/nova-custom-config.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: nova-custom-config
6+
data:
7+
25-nova-custom.conf: |
8+
[DEFAULT]
9+
# Override our defaults in this dt to get coverage for metadata-api based
10+
# cloud-init scenarios
11+
force_config_drive = False
12+
55-nova-extra.conf: |
13+
# Additional overrides that can be set in environment-specific cases

‎dt/uni05epsilon/edpm-post-ceph/nodeset2/resources/nova-custom-service.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
apiVersion: dataplane.openstack.org/v1beta1
3+
kind: OpenStackDataPlaneService
4+
metadata:
5+
name: nova-custom
6+
spec:
7+
label: dataplane-deployment-nova-custom
8+
dataSources:
9+
- configMapRef:
10+
name: nova-custom-config
11+
- secretRef:
12+
name: nova-cell1-compute-config
13+
- secretRef:
14+
name: nova-migration-ssh-key
15+
playbook: osp.edpm.nova
16+
caCerts: combined-ca-bundle
17+
tlsCerts:
18+
default:
19+
contents:
20+
- dnsnames
21+
- ips
22+
networks:
23+
- ctlplane
24+
issuer: osp-rootca-issuer-internal
25+
edpmRoleServiceName: nova
26+
edpmServiceType: nova
27+
containerImageFields:
28+
- NovaComputeImage
29+
- EdpmIscsidImage

0 commit comments

Comments
 (0)