File tree Expand file tree Collapse file tree 11 files changed +115
-68
lines changed Expand file tree Collapse file tree 11 files changed +115
-68
lines changed Original file line number Diff line number Diff line change 2
2
vas :
3
3
hci-adoption :
4
4
stages :
5
- - path : examples/va/hci/control-plane/nncp
5
+ - path : examples/va/hci/control-plane/network/ nncp
6
6
wait_conditions :
7
7
- >-
8
8
oc -n openstack wait nncp
14
14
src_file : values.yaml
15
15
build_output : nncp.yaml
16
16
17
- - path : examples/va/hci/control-plane
17
+ - path : examples/va/hci/control-plane/network
18
18
wait_conditions :
19
19
- >-
20
- oc -n openstack wait nncp
21
- -l osp/nncm-config-type=standard
22
- --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
20
+ oc -n metallb-system wait pod
21
+ -l app=metallb -l component=speaker
22
+ --for condition=Ready
23
23
--timeout=5m
24
24
values :
25
25
- name : network-values
Original file line number Diff line number Diff line change 2
2
vas :
3
3
hci :
4
4
stages :
5
- - path : examples/va/hci/control-plane/nncp
5
+ - path : examples/va/hci/control-plane/network/ nncp
6
6
wait_conditions :
7
7
- >-
8
8
oc -n openstack wait nncp
14
14
src_file : values.yaml
15
15
build_output : nncp.yaml
16
16
17
+ - path : examples/va/hci/control-plane/network
18
+ wait_conditions :
19
+ - >-
20
+ oc -n metallb-system wait pod
21
+ -l app=metallb -l component=speaker
22
+ --for condition=Ready
23
+ --timeout=5m
24
+ values :
25
+ - name : network-values
26
+ src_file : nncp/values.yaml
27
+ build_output : network.yaml
28
+
17
29
- path : examples/va/hci/control-plane
18
30
wait_conditions :
19
31
- >-
23
35
- name : service-values
24
36
src_file : service-values.yaml
25
37
- name : network-values
26
- src_file : nncp/values.yaml
38
+ src_file : network/ nncp/values.yaml
27
39
build_output : ../control-plane.yaml
28
40
29
41
- path : examples/va/hci/edpm-pre-ceph/nodeset
Original file line number Diff line number Diff line change @@ -14,16 +14,16 @@ Change to the hci directory
14
14
```
15
15
cd architecture/examples/va/hci
16
16
```
17
- Edit the [ control-plane/nncp/values.yaml] ( control-plane/nncp/values.yaml ) file to suit your environment.
17
+ Edit the [ control-plane/network/ nncp/values.yaml] ( control-plane/network /nncp/values.yaml ) file to suit your environment.
18
18
```
19
- vi control-plane/nncp/values.yaml
19
+ vi control-plane/network/ nncp/values.yaml
20
20
```
21
21
22
22
## Apply node network configuration
23
23
24
24
Generate the node network configuration
25
25
```
26
- kustomize build control-plane/nncp > nncp.yaml
26
+ kustomize build control-plane/network/ nncp > nncp.yaml
27
27
```
28
28
Apply the NNCP CRs
29
29
```
@@ -34,6 +34,17 @@ Wait for NNCPs to be available
34
34
oc wait nncp -l osp/nncm-config-type=standard --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured --timeout=300s
35
35
```
36
36
37
+ ## Apply remaining networking configuration
38
+
39
+ Generate the reminaing network configuration
40
+ ```
41
+ kustomize build control-plane/network > network.yaml
42
+ ```
43
+ Apply the network CRs
44
+ ```
45
+ oc apply -f network.yaml
46
+ ```
47
+
37
48
## Apply networking and control-plane configuration
38
49
39
50
Generate the control-plane and networking CRs.
Original file line number Diff line number Diff line change @@ -9,5 +9,5 @@ components:
9
9
# # https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
10
10
11
11
resources :
12
- - nncp/values.yaml
12
+ - network/ nncp/values.yaml
13
13
- service-values.yaml
Original file line number Diff line number Diff line change
1
+ ---
2
+ apiVersion : kustomize.config.k8s.io/v1beta1
3
+ kind : Kustomization
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/networking/metallb
22
+ - ../../../../../lib/networking/netconfig
23
+ - ../../../../../lib/networking/nad
24
+
25
+ resources :
26
+ - nncp/values.yaml
27
+
28
+ # Add storagemgmt network template, as it is needed for CephHCI
29
+ patches :
30
+ - target :
31
+ version : v1beta1
32
+ kind : NetConfig
33
+ name : netconfig
34
+ patch : |-
35
+ - op: add
36
+ path: /spec/networks/-
37
+ value:
38
+ dnsDomain: _replaced_
39
+ name: storagemgmt
40
+ subnets:
41
+ - _replaced_
42
+ mtu: 1500
43
+
44
+ # Add storagemgmt network replacements
45
+ replacements :
46
+ # NetConfig dnsDomain specific to this VA
47
+ - source :
48
+ kind : ConfigMap
49
+ name : network-values
50
+ fieldPath : data.storagemgmt.dnsDomain
51
+ targets :
52
+ - select :
53
+ kind : NetConfig
54
+ fieldPaths :
55
+ - spec.networks.[name=storagemgmt].dnsDomain
56
+ # NetConfig MTU specific to this VA
57
+ - source :
58
+ kind : ConfigMap
59
+ name : network-values
60
+ fieldPath : data.storagemgmt.mtu
61
+ targets :
62
+ - select :
63
+ kind : NetConfig
64
+ fieldPaths :
65
+ - spec.networks.[name=storagemgmt].mtu
66
+ # NetConfig subnets specific to this VA
67
+ - source :
68
+ kind : ConfigMap
69
+ name : network-values
70
+ fieldPath : data.storagemgmt.subnets
71
+ targets :
72
+ - select :
73
+ kind : NetConfig
74
+ fieldPaths :
75
+ - spec.networks.[name=storagemgmt].subnets
File renamed without changes.
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ transformers:
18
18
create: true
19
19
20
20
components :
21
- - ../../../../../lib/nncp
21
+ - ../../../../../../ lib/nncp
22
22
23
23
resources :
24
24
- values.yaml
File renamed without changes.
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ components:
10
10
# # https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
11
11
12
12
resources :
13
- - control-plane/nncp/values.yaml
13
+ - control-plane/network/ nncp/values.yaml
14
14
- edpm-pre-ceph/nodeset/values.yaml
15
15
- service-values.yaml
16
16
- values.yaml
Original file line number Diff line number Diff line change @@ -18,56 +18,4 @@ transformers:
18
18
create: true
19
19
20
20
components :
21
- - ../../lib/networking/metallb
22
- - ../../lib/networking/netconfig
23
- - ../../lib/networking/nad
24
21
- ../../lib/control-plane
25
-
26
- # Add storagemgmt network template, as it is needed for CephHCI
27
- patches :
28
- - target :
29
- version : v1beta1
30
- kind : NetConfig
31
- name : netconfig
32
- patch : |-
33
- - op: add
34
- path: /spec/networks/-
35
- value:
36
- dnsDomain: _replaced_
37
- name: storagemgmt
38
- subnets:
39
- - _replaced_
40
- mtu: 1500
41
-
42
- # Add storagemgmt network replacements
43
- replacements :
44
- # NetConfig dnsDomain specific to this VA
45
- - source :
46
- kind : ConfigMap
47
- name : network-values
48
- fieldPath : data.storagemgmt.dnsDomain
49
- targets :
50
- - select :
51
- kind : NetConfig
52
- fieldPaths :
53
- - spec.networks.[name=storagemgmt].dnsDomain
54
- # NetConfig MTU specific to this VA
55
- - source :
56
- kind : ConfigMap
57
- name : network-values
58
- fieldPath : data.storagemgmt.mtu
59
- targets :
60
- - select :
61
- kind : NetConfig
62
- fieldPaths :
63
- - spec.networks.[name=storagemgmt].mtu
64
- # NetConfig subnets specific to this VA
65
- - source :
66
- kind : ConfigMap
67
- name : network-values
68
- fieldPath : data.storagemgmt.subnets
69
- targets :
70
- - select :
71
- kind : NetConfig
72
- fieldPaths :
73
- - spec.networks.[name=storagemgmt].subnets
Original file line number Diff line number Diff line change 58
58
files :
59
59
- examples/va/hci
60
60
- examples/va/hci/control-plane
61
- - examples/va/hci/control-plane/nncp
61
+ - examples/va/hci/control-plane/network
62
+ - examples/va/hci/control-plane/network/nncp
62
63
- examples/va/hci/deployment
63
64
- examples/va/hci/edpm-pre-ceph/deployment
64
65
- examples/va/hci/edpm-pre-ceph/nodeset
70
71
cifmw_architecture_scenario : hci
71
72
- job :
72
73
files :
73
- - examples/va/hci/control-plane
74
- - examples/va/hci/control-plane/nncp
74
+ - examples/va/hci/control-plane/network
75
+ - examples/va/hci/control-plane/network/ nncp
75
76
- lib
76
77
name : rhoso-architecture-validate-hci-adoption
77
78
parent : rhoso-architecture-base-job
You can’t perform that action at this time.
0 commit comments