Skip to content

Commit 0d89ef6

Browse files
lavrahamlavraham
committed
enable octavia in uni02beta
1 parent d6cba58 commit 0d89ef6

File tree

7 files changed

+359
-2
lines changed

7 files changed

+359
-2
lines changed

‎dt/uni02beta/kustomization.yaml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
apiVersion: kustomize.config.k8s.io/v1alpha1
33
kind: Component
44

5+
secretGenerator:
6+
- name: octavia-ca-passphrase
7+
literals:
8+
- server-ca-passphrase=12345678
9+
options:
10+
disableNameSuffixHash: true
11+
512
transformers:
613
- |-
714
apiVersion: builtin
@@ -271,3 +278,100 @@ replacements:
271278
- spec.heat.enabled
272279
options:
273280
create: true
281+
282+
# Octavia
283+
- source:
284+
kind: ConfigMap
285+
name: service-values
286+
fieldPath: data.octavia.enabled
287+
targets:
288+
- select:
289+
kind: OpenStackControlPlane
290+
fieldPaths:
291+
- spec.octavia.enabled
292+
options:
293+
create: true
294+
295+
- source:
296+
kind: ConfigMap
297+
name: service-values
298+
fieldPath: data.octavia.amphoraImageContainerImage
299+
targets:
300+
- select:
301+
kind: OpenStackControlPlane
302+
fieldPaths:
303+
- spec.octavia.template.amphoraImageContainerImage
304+
options:
305+
create: true
306+
307+
- source:
308+
kind: ConfigMap
309+
name: service-values
310+
fieldPath: data.octavia.apacheContainerImage
311+
targets:
312+
- select:
313+
kind: OpenStackControlPlane
314+
fieldPaths:
315+
- spec.octavia.template.apacheContainerImage
316+
options:
317+
create: true
318+
319+
- source:
320+
kind: ConfigMap
321+
name: service-values
322+
fieldPath: data.octavia.octaviaAPI.networkAttachments
323+
targets:
324+
- select:
325+
kind: OpenStackControlPlane
326+
fieldPaths:
327+
- spec.octavia.template.octaviaAPI.networkAttachments
328+
options:
329+
create: true
330+
331+
- source:
332+
kind: ConfigMap
333+
name: service-values
334+
fieldPath: data.octavia.octaviaHousekeeping.networkAttachments
335+
targets:
336+
- select:
337+
kind: OpenStackControlPlane
338+
fieldPaths:
339+
- spec.octavia.template.octaviaHousekeeping.networkAttachments
340+
options:
341+
create: true
342+
343+
- source:
344+
kind: ConfigMap
345+
name: service-values
346+
fieldPath: data.octavia.octaviaHealthManager.networkAttachments
347+
targets:
348+
- select:
349+
kind: OpenStackControlPlane
350+
fieldPaths:
351+
- spec.octavia.template.octaviaHealthManager.networkAttachments
352+
options:
353+
create: true
354+
355+
- source:
356+
kind: ConfigMap
357+
name: service-values
358+
fieldPath: data.octavia.octaviaWorker.networkAttachments
359+
targets:
360+
- select:
361+
kind: OpenStackControlPlane
362+
fieldPaths:
363+
- spec.octavia.template.octaviaWorker.networkAttachments
364+
options:
365+
create: true
366+
367+
- source:
368+
kind: ConfigMap
369+
name: service-values
370+
fieldPath: data.ovn.ovnController.nicMappings
371+
targets:
372+
- select:
373+
kind: OpenStackControlPlane
374+
fieldPaths:
375+
- spec.ovn.template.ovnController.nicMappings
376+
options:
377+
create: true

‎dt/uni02beta/networking/kustomization.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,21 @@ transformers:
1515
- path: metadata/name
1616
kind: Namespace
1717
create: true
18+
1819
components:
19-
- ../../../lib/networking/metallb
20-
- ../../../lib/networking/netconfig
2120
- ../../../lib/networking/nad
21+
22+
resources:
23+
- nad.yaml
24+
25+
replacements:
26+
- source:
27+
kind: ConfigMap
28+
name: network-values
29+
fieldPath: data.octavia.net-attach-def
30+
targets:
31+
- select:
32+
kind: NetworkAttachmentDefinition
33+
name: octavia
34+
fieldPaths:
35+
- spec.config

‎dt/uni02beta/networking/nad.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: k8s.cni.cncf.io/v1
3+
kind: NetworkAttachmentDefinition
4+
metadata:
5+
name: octavia
6+
labels:
7+
osp/net: octavia
8+
osp/net-attach-def-type: standard

‎dt/uni02beta/networking/nncp/kustomization.yaml‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
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+
patches:
20+
- target:
21+
kind: NodeNetworkConfigurationPolicy
22+
name: master-0
23+
patch: |-
24+
- op: add
25+
path: /spec/desiredState/interfaces/-
26+
value:
27+
description: Octavia vlan host interface
28+
name: octavia
29+
state: up
30+
type: vlan
31+
vlan:
32+
base-iface: _replaced_
33+
id: _replaced_
34+
35+
- target:
36+
kind: NodeNetworkConfigurationPolicy
37+
name: master-0
38+
patch: |-
39+
- op: add
40+
path: /spec/desiredState/interfaces/-
41+
value:
42+
description: Octavia bridge
43+
mtu: 1500
44+
name: octbr
45+
type: linux-bridge
46+
bridge:
47+
options:
48+
stp:
49+
enabled: false
50+
port:
51+
- name: octavia
52+
53+
- target:
54+
kind: NodeNetworkConfigurationPolicy
55+
name: master-1
56+
patch: |-
57+
- op: add
58+
path: /spec/desiredState/interfaces/-
59+
value:
60+
description: Octavia vlan host interface
61+
name: octavia
62+
state: up
63+
type: vlan
64+
vlan:
65+
base-iface: _replaced_
66+
id: _replaced_
67+
68+
- target:
69+
kind: NodeNetworkConfigurationPolicy
70+
name: master-1
71+
patch: |-
72+
- op: add
73+
path: /spec/desiredState/interfaces/-
74+
value:
75+
description: Octavia bridge
76+
mtu: 1500
77+
name: octbr
78+
type: linux-bridge
79+
bridge:
80+
options:
81+
stp:
82+
enabled: false
83+
port:
84+
- name: octavia
85+
86+
- target:
87+
kind: NodeNetworkConfigurationPolicy
88+
name: master-2
89+
patch: |-
90+
- op: add
91+
path: /spec/desiredState/interfaces/-
92+
value:
93+
description: Octavia vlan host interface
94+
name: octavia
95+
state: up
96+
type: vlan
97+
vlan:
98+
base-iface: _replaced_
99+
id: _replaced_
100+
101+
- target:
102+
kind: NodeNetworkConfigurationPolicy
103+
name: master-2
104+
patch: |-
105+
- op: add
106+
path: /spec/desiredState/interfaces/-
107+
value:
108+
description: Octavia bridge
109+
mtu: 1500
110+
name: octbr
111+
type: linux-bridge
112+
bridge:
113+
options:
114+
stp:
115+
enabled: false
116+
port:
117+
- name: octavia
118+
119+
replacements:
120+
- source:
121+
kind: ConfigMap
122+
name: network-values
123+
fieldPath: data.octavia.base_iface
124+
targets:
125+
- select:
126+
kind: NodeNetworkConfigurationPolicy
127+
name: master-0
128+
fieldPaths:
129+
- spec.desiredState.interfaces.[name=octavia].vlan.base-iface
130+
131+
- source:
132+
kind: ConfigMap
133+
name: network-values
134+
fieldPath: data.octavia.vlan
135+
targets:
136+
- select:
137+
kind: NodeNetworkConfigurationPolicy
138+
name: master-0
139+
fieldPaths:
140+
- spec.desiredState.interfaces.[name=octavia].vlan.id
141+
142+
- source:
143+
kind: ConfigMap
144+
name: network-values
145+
fieldPath: data.octavia.base_iface
146+
targets:
147+
- select:
148+
kind: NodeNetworkConfigurationPolicy
149+
name: master-1
150+
fieldPaths:
151+
- spec.desiredState.interfaces.[name=octavia].vlan.base-iface
152+
153+
- source:
154+
kind: ConfigMap
155+
name: network-values
156+
fieldPath: data.octavia.vlan
157+
targets:
158+
- select:
159+
kind: NodeNetworkConfigurationPolicy
160+
name: master-1
161+
fieldPaths:
162+
- spec.desiredState.interfaces.[name=octavia].vlan.id
163+
164+
- source:
165+
kind: ConfigMap
166+
name: network-values
167+
fieldPath: data.octavia.base_iface
168+
targets:
169+
- select:
170+
kind: NodeNetworkConfigurationPolicy
171+
name: master-2
172+
fieldPaths:
173+
- spec.desiredState.interfaces.[name=octavia].vlan.base-iface
174+
175+
- source:
176+
kind: ConfigMap
177+
name: network-values
178+
fieldPath: data.octavia.vlan
179+
targets:
180+
- select:
181+
kind: NodeNetworkConfigurationPolicy
182+
name: master-2
183+
fieldPaths:
184+
- spec.desiredState.interfaces.[name=octavia].vlan.id

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ transformers:
1818
1919
components:
2020
- ../../../../../../lib/nncp
21+
- ../../../../../../dt/uni02beta/networking/nncp
2122

2223
resources:
2324
- values.yaml

‎examples/dt/uni02beta/control-plane/networking/nncp/values.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,30 @@ data:
169169
"range_end": "172.19.0.70"
170170
}
171171
}
172+
octavia:
173+
dnsDomain: octavia.openstack.lab
174+
mtu: 1500
175+
vlan: 23
176+
base_iface: enp7s0
177+
net-attach-def: |
178+
{
179+
"cniVersion": "0.3.1",
180+
"name": "octavia",
181+
"type": "bridge",
182+
"bridge": "octbr",
183+
"ipam": {
184+
"type": "whereabouts",
185+
"range": "172.23.0.0/24",
186+
"range_start": "172.23.0.30",
187+
"range_end": "172.23.0.70",
188+
"routes": [
189+
{
190+
"dst": "172.24.0.0/16",
191+
"gw": "172.23.0.150"
192+
}
193+
]
194+
}
195+
}
172196
external:
173197
dnsDomain: external.example.com
174198
subnets:

‎examples/dt/uni02beta/control-plane/service-values.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,25 @@ data:
110110

111111
heat:
112112
enabled: true
113+
114+
octavia:
115+
enabled: true
116+
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
117+
apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
118+
octaviaAPI:
119+
networkAttachments:
120+
- internalapi
121+
octaviaHousekeeping:
122+
networkAttachments:
123+
- octavia
124+
octaviaHealthManager:
125+
networkAttachments:
126+
- octavia
127+
octaviaWorker:
128+
networkAttachments:
129+
- octavia
130+
131+
ovn:
132+
ovnController:
133+
nicMappings:
134+
octavia: octbr

0 commit comments

Comments
 (0)