Skip to content

Commit b945fba

Browse files
Merge pull request #401 from jamepark4/add_multicell_dt
Add nova 3 cell DT Standard deployments currently deploy cell0 and cell1. Create a DT that deploys cell0, cell1, and cell2. Depends-On: openstack-k8s-operators/ci-framework#2423 Reviewed-by: Harald <[email protected]> Reviewed-by: jamepark4 <[email protected]> Reviewed-by: Balazs Gibizer <[email protected]> Reviewed-by: Bogdan Dobrelya Reviewed-by: Andrew Bays <[email protected]>
2 parents 2da816a + 191d2bf commit b945fba

File tree

23 files changed

+1239
-0
lines changed

23 files changed

+1239
-0
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
vas:
3+
nova-three-cells:
4+
stages:
5+
- path: examples/dt/nova/nova-three-cells/control-plane/nncp
6+
wait_conditions:
7+
- >-
8+
oc -n openstack wait nncp
9+
-l osp/nncm-config-type=standard
10+
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
11+
--timeout=60s
12+
values:
13+
- name: network-values
14+
src_file: values.yaml
15+
build_output: nncp.yaml
16+
17+
- path: examples/dt/nova/nova-three-cells/control-plane
18+
wait_conditions:
19+
- >-
20+
oc -n openstack wait osctlplane controlplane --for condition=Ready
21+
--timeout=1800s
22+
values:
23+
- name: network-values
24+
src_file: nncp/values.yaml
25+
- name: service-values
26+
src_file: service-values.yaml
27+
build_output: control-plane.yaml
28+
29+
- path: examples/dt/nova/nova-three-cells/edpm/nodeset
30+
wait_conditions:
31+
- >-
32+
oc -n openstack wait
33+
osdpns openstack-edpm --for condition=SetupReady
34+
--timeout=60m
35+
values:
36+
- name: edpm-nodeset-values
37+
src_file: values.yaml
38+
build_output: nodeset.yaml
39+
40+
- path: examples/dt/nova/nova-three-cells/edpm/nodeset2
41+
wait_conditions:
42+
- >-
43+
oc -n openstack wait
44+
osdpns openstack-edpm-2 --for condition=SetupReady
45+
--timeout=60m
46+
values:
47+
- name: edpm-nodeset2-values
48+
src_file: values.yaml
49+
build_output: nodeset2.yaml
50+
51+
- path: examples/dt/nova/nova-three-cells/edpm/deployment
52+
wait_conditions:
53+
- >-
54+
oc -n openstack wait openstackdataplanedeployment
55+
edpm-deployment --for condition=Ready
56+
--timeout=60m
57+
values:
58+
- name: edpm-deployment-values
59+
src_file: values.yaml
60+
build_output: deployment.yaml

dt/nova/nova-three-cells/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Deployed Topology - Nova/Three Cells
2+
3+
If you are looking for information on how to deploy the multiplecells based DT, then
4+
please see the
5+
[README](../../../examples/dt/nova/nova-three-cells/README.md) in the examples
6+
directory.
7+
8+
This directory ,`dt/nova/nova-three-cells/`, exists so that the
9+
[kustomization.yaml](../../../examples/dt/nova/nova-three-cells/control-plane/kustomization.yaml)
10+
in the examples directory of nova-three-cells topology, reference it by path as a
11+
component. It's contents are likely uninteresting unless you want to understand
12+
how kustomize was implemented in this repository.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
transformers:
6+
# Set namespace to OpenStack on all namespaced objects without a namespace
7+
- |-
8+
apiVersion: builtin
9+
kind: NamespaceTransformer
10+
metadata:
11+
name: _ignored_
12+
namespace: openstack
13+
setRoleBindingSubjects: none
14+
unsetOnly: true
15+
fieldSpecs:
16+
- path: metadata/name
17+
kind: Namespace
18+
create: true
19+
20+
components:
21+
- ../../../../../lib/dataplane/deployment
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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
Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
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/networking/metallb
21+
- ../../../lib/networking/netconfig
22+
- ../../../lib/networking/nad
23+
- ../../../lib/control-plane
24+
25+
replacements:
26+
- source:
27+
kind: ConfigMap
28+
name: service-values
29+
fieldPath: data.galera.templates.openstack-cell2
30+
targets:
31+
- select:
32+
kind: OpenStackControlPlane
33+
fieldPaths:
34+
- spec.galera.templates.openstack-cell2
35+
options:
36+
create: true
37+
- source:
38+
kind: ConfigMap
39+
name: service-values
40+
fieldPath: data.glance.customServiceConfig
41+
targets:
42+
- select:
43+
kind: OpenStackControlPlane
44+
fieldPaths:
45+
- spec.glance.template.customServiceConfig
46+
options:
47+
create: true
48+
- source:
49+
kind: ConfigMap
50+
name: service-values
51+
fieldPath: data.glance.default.replicas
52+
targets:
53+
- select:
54+
kind: OpenStackControlPlane
55+
fieldPaths:
56+
- spec.glance.template.glanceAPIs.default.replicas
57+
options:
58+
create: true
59+
- source:
60+
kind: ConfigMap
61+
name: service-values
62+
fieldPath: data.swift.enabled
63+
targets:
64+
- select:
65+
kind: OpenStackControlPlane
66+
fieldPaths:
67+
- spec.swift.enabled
68+
options:
69+
create: true
70+
- source:
71+
kind: ConfigMap
72+
name: service-values
73+
fieldPath: data.telemetry.enabled
74+
targets:
75+
- select:
76+
kind: OpenStackControlPlane
77+
fieldPaths:
78+
- spec.telemetry.enabled
79+
options:
80+
create: true
81+
- source:
82+
kind: ConfigMap
83+
name: service-values
84+
fieldPath: data.telemetry.template.ceilometer.enabled
85+
targets:
86+
- select:
87+
kind: OpenStackControlPlane
88+
fieldPaths:
89+
- spec.telemetry.template.ceilometer.enabled
90+
options:
91+
create: true
92+
- source:
93+
kind: ConfigMap
94+
name: network-values
95+
fieldPath: data.rabbitmq-cell2.endpoint_annotations
96+
targets:
97+
- select:
98+
kind: OpenStackControlPlane
99+
fieldPaths:
100+
- spec.rabbitmq.templates.rabbitmq-cell2.override.service.metadata.annotations
101+
options:
102+
create: true
103+
- source:
104+
kind: ConfigMap
105+
name: service-values
106+
fieldPath: data.rabbitmq.templates.rabbitmq-cell2.replicas
107+
targets:
108+
- select:
109+
kind: OpenStackControlPlane
110+
fieldPaths:
111+
- spec.rabbitmq.templates.rabbitmq-cell2.replicas
112+
options:
113+
create: true
114+
- source:
115+
kind: ConfigMap
116+
name: network-values
117+
fieldPath: data.lbServiceType
118+
targets:
119+
- select:
120+
kind: OpenStackControlPlane
121+
fieldPaths:
122+
- spec.rabbitmq.templates.rabbitmq-cell2.override.service.spec.type
123+
options:
124+
create: true
125+
- source:
126+
kind: ConfigMap
127+
name: service-values
128+
fieldPath: data.nova.template.cellTemplates.cell2
129+
targets:
130+
- select:
131+
kind: OpenStackControlPlane
132+
fieldPaths:
133+
- spec.nova.template.cellTemplates.cell2
134+
options:
135+
create: true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
apiVersion: builtin
3+
kind: NamespaceTransformer
4+
metadata:
5+
name: _ignored_
6+
namespace: openstack
7+
setRoleBindingSubjects: none
8+
unsetOnly: true
9+
fieldSpecs:
10+
- path: metadata/name
11+
kind: Namespace
12+
create: true

0 commit comments

Comments
 (0)