Skip to content

Commit 8d9fb3b

Browse files
fyanacfyanac
committed
Add worker-0 NNCP networking for uni04delta-adoption
Following configuration from other adoptions jobs that use worker-0 like uni02beta and uni04delta-ipv6.
1 parent 979ddd7 commit 8d9fb3b

7 files changed

Lines changed: 472 additions & 2 deletions

File tree

‎automation/net-env/uni04delta-adoption.yaml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,52 @@ instances:
409409
prefix_length_v4: 24
410410
skip_nm: false
411411
vlan_id: 122
412+
ocp-3:
413+
hostname: worker-0
414+
name: ocp-3
415+
networks:
416+
ctlplane:
417+
interface_name: enp6s0
418+
ip_v4: 192.168.122.20
419+
mac_addr: "52:54:02:18:86:bc"
420+
mtu: 1500
421+
netmask_v4: 255.255.255.0
422+
network_name: ctlplane
423+
prefix_length_v4: 24
424+
skip_nm: false
425+
internalapi:
426+
interface_name: enp6s0.120
427+
ip_v4: 172.17.0.20
428+
mac_addr: "52:54:00:04:df:88"
429+
mtu: 1500
430+
netmask_v4: 255.255.255.0
431+
network_name: internalapi
432+
parent_interface: enp6s0
433+
prefix_length_v4: 24
434+
skip_nm: false
435+
vlan_id: 120
436+
storage:
437+
interface_name: enp6s0.121
438+
ip_v4: 172.18.0.20
439+
mac_addr: "52:54:00:7e:b2:1d"
440+
mtu: 1500
441+
netmask_v4: 255.255.255.0
442+
network_name: storage
443+
parent_interface: enp6s0
444+
prefix_length_v4: 24
445+
skip_nm: false
446+
vlan_id: 121
447+
tenant:
448+
interface_name: enp6s0.122
449+
ip_v4: 172.19.0.20
450+
mac_addr: "52:54:00:12:d1:e1"
451+
mtu: 1500
452+
netmask_v4: 255.255.255.0
453+
network_name: tenant
454+
parent_interface: enp6s0
455+
prefix_length_v4: 24
456+
skip_nm: false
457+
vlan_id: 122
412458
networker-0:
413459
hostname: networker-0
414460
name: networker-0

‎automation/vars/uni04delta-adoption.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vas:
33
uni04delta-adoption:
44
stages:
55
- name: nncp-configuration
6-
path: examples/dt/uni04delta/control-plane/networking/nncp
6+
path: examples/dt/uni04delta-adoption/control-plane/networking/nncp
77
wait_conditions:
88
- >-
99
oc -n openstack wait nncp
@@ -16,7 +16,7 @@ vas:
1616
build_output: nncp.yaml
1717

1818
- name: network-configuration
19-
path: examples/dt/uni04delta/control-plane/networking
19+
path: examples/dt/uni04delta-adoption/control-plane/networking
2020
wait_conditions:
2121
- >-
2222
oc -n metallb-system wait pod

‎examples/dt/uni04delta-adoption/control-plane/networking/kustomization.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
5+
components:
6+
- ../../../../../dt/uni04delta/networking
7+
8+
resources:
9+
- nncp/values.yaml

‎examples/dt/uni04delta-adoption/control-plane/networking/nncp/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nncp.yaml

‎examples/dt/uni04delta-adoption/control-plane/networking/nncp/kustomization.yaml‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
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+
- ../../../../../../dt/uni04delta/networking/nncp
21+
22+
resources:
23+
- values.yaml
24+
- ocp_worker_nodes.yaml
25+
26+
replacements:
27+
# Static Node IPs: node-3 (worker-0)
28+
- source:
29+
kind: ConfigMap
30+
name: network-values
31+
fieldPath: data.node_3.internalapi_ip
32+
targets:
33+
- select:
34+
kind: NodeNetworkConfigurationPolicy
35+
name: node-3
36+
fieldPaths:
37+
- spec.desiredState.interfaces.[name=internalapi].ipv4.address.0.ip
38+
- source:
39+
kind: ConfigMap
40+
name: network-values
41+
fieldPath: data.node_3.tenant_ip
42+
targets:
43+
- select:
44+
kind: NodeNetworkConfigurationPolicy
45+
name: node-3
46+
fieldPaths:
47+
- spec.desiredState.interfaces.[name=tenant].ipv4.address.0.ip
48+
- source:
49+
kind: ConfigMap
50+
name: network-values
51+
fieldPath: data.node_3.ctlplane_ip
52+
targets:
53+
- select:
54+
kind: NodeNetworkConfigurationPolicy
55+
name: node-3
56+
fieldPaths:
57+
- spec.desiredState.interfaces.[type=linux-bridge].ipv4.address.0.ip
58+
- source:
59+
kind: ConfigMap
60+
name: network-values
61+
fieldPath: data.node_3.storage_ip
62+
targets:
63+
- select:
64+
kind: NodeNetworkConfigurationPolicy
65+
name: node-3
66+
fieldPaths:
67+
- spec.desiredState.interfaces.[name=storage].ipv4.address.0.ip
68+
69+
# prefix-length: node-3
70+
- source:
71+
kind: ConfigMap
72+
name: network-values
73+
fieldPath: data.ctlplane.prefix-length
74+
targets:
75+
- select:
76+
kind: NodeNetworkConfigurationPolicy
77+
name: node-3
78+
fieldPaths:
79+
- spec.desiredState.interfaces.[type=linux-bridge].ipv4.address.0.prefix-length
80+
- source:
81+
kind: ConfigMap
82+
name: network-values
83+
fieldPath: data.internalapi.prefix-length
84+
targets:
85+
- select:
86+
kind: NodeNetworkConfigurationPolicy
87+
name: node-3
88+
fieldPaths:
89+
- spec.desiredState.interfaces.[name=internalapi].ipv4.address.0.prefix-length
90+
- source:
91+
kind: ConfigMap
92+
name: network-values
93+
fieldPath: data.tenant.prefix-length
94+
targets:
95+
- select:
96+
kind: NodeNetworkConfigurationPolicy
97+
name: node-3
98+
fieldPaths:
99+
- spec.desiredState.interfaces.[name=tenant].ipv4.address.0.prefix-length
100+
- source:
101+
kind: ConfigMap
102+
name: network-values
103+
fieldPath: data.storage.prefix-length
104+
targets:
105+
- select:
106+
kind: NodeNetworkConfigurationPolicy
107+
name: node-3
108+
fieldPaths:
109+
- spec.desiredState.interfaces.[name=storage].ipv4.address.0.prefix-length
110+
111+
# Node name and hostname selector
112+
- source:
113+
kind: ConfigMap
114+
name: network-values
115+
fieldPath: data.node_3.name
116+
targets:
117+
- select:
118+
kind: NodeNetworkConfigurationPolicy
119+
name: node-3
120+
fieldPaths:
121+
- metadata.name
122+
- spec.nodeSelector.[kubernetes.io/hostname]

‎examples/dt/uni04delta-adoption/control-plane/networking/nncp/ocp_worker_nodes.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
apiVersion: nmstate.io/v1
3+
kind: NodeNetworkConfigurationPolicy
4+
metadata:
5+
name: node-3
6+
labels:
7+
osp/nncm-config-type: standard

0 commit comments

Comments
 (0)