Skip to content

Commit 8826237

Browse files
committed
Enable Octavia in DCN
1 parent bd717bd commit 8826237

File tree

6 files changed

+119
-1
lines changed

6 files changed

+119
-1
lines changed

dt/dcn/control-plane/kustomization.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@ replacements:
7777
- spec.ovn.template.ovnController.external-ids
7878
options:
7979
create: true
80+
- source:
81+
kind: ConfigMap
82+
name: service-values
83+
fieldPath: data.ovn.template.ovnController.nicMappings
84+
targets:
85+
- select:
86+
kind: OpenStackControlPlane
87+
fieldPaths:
88+
- spec.ovn.template.ovnController.nicMappings
89+
options:
90+
create: true
8091
- source:
8192
kind: ConfigMap
8293
name: service-values
@@ -220,3 +231,27 @@ replacements:
220231
- spec.extraMounts
221232
options:
222233
create: true
234+
235+
- source:
236+
kind: ConfigMap
237+
name: service-values
238+
fieldPath: data.octavia.enabled
239+
targets:
240+
- select:
241+
kind: OpenStackControlPlane
242+
fieldPaths:
243+
- spec.octavia.enabled
244+
options:
245+
create: true
246+
247+
- source:
248+
kind: ConfigMap
249+
name: service-values
250+
fieldPath: data.octavia.template
251+
targets:
252+
- select:
253+
kind: OpenStackControlPlane
254+
fieldPaths:
255+
- spec.octavia.template
256+
options:
257+
create: true

dt/dcn/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ replacements:
8282
fieldPaths:
8383
- spec.networks.[name=storagemgmt].subnets
8484

85+
# Octavia support
8586
- source:
8687
kind: ConfigMap
8788
name: network-values

examples/dt/dcn/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ This is a collection of CR templates that represent a Red Hat OpenStack Services
2020
- Cinder Backup using RBD for backend
2121
- Glance using Multi Store Support and RBD for backend
2222
- Nova using RBD for ephemeral storage
23+
- Octavia enabled in DCN sites with split management networks (one management network per DCN site)
2324

2425
## Considerations
2526

examples/dt/dcn/control-plane/scaledown/service-values.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,40 @@ data:
190190
network_vlan_ranges = datacentre:1:1000,leaf1:1:1000,leaf2:1:1000
191191
[neutron]
192192
physnets = datacentre,leaf1,leaf2
193+
octavia:
194+
enabled: true
195+
template:
196+
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
197+
lbMgmtNetwork:
198+
createDefaultLbMgmtNetwork: false
199+
lbMgmtRouterGateway: 172.23.0.150
200+
availabilityZones:
201+
- az0
202+
octaviaAPI:
203+
networkAttachments:
204+
- internalapi
205+
customServiceConfig: |
206+
[controller_worker]
207+
loadbalancer_topology=ACTIVE_STANDBY
208+
octaviaHousekeeping:
209+
networkAttachments:
210+
- octavia
211+
customServiceConfig: |
212+
[controller_worker]
213+
loadbalancer_topology=ACTIVE_STANDBY
214+
octaviaHealthManager:
215+
networkAttachments:
216+
- octavia
217+
customServiceConfig: |
218+
[controller_worker]
219+
loadbalancer_topology=ACTIVE_STANDBY
220+
octaviaWorker:
221+
networkAttachments:
222+
- octavia
223+
customServiceConfig: |
224+
[controller_worker]
225+
loadbalancer_topology=ACTIVE_STANDBY
226+
193227
ovn:
194228
template:
195229
ovnController:
@@ -199,6 +233,9 @@ data:
199233
ovn-bridge: br-int
200234
ovn-encap-type: geneve
201235
system-id: random
236+
nicMappings:
237+
datacentre: ocpbr
238+
octavia: octbr
202239
nova:
203240
customServiceConfig: |
204241
[DEFAULT]

examples/dt/dcn/dataplane-post-ceph.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,22 @@ of how to DTs should look when AZ1 is removed. To view them run the following co
104104

105105
```shell
106106
kustomize build architecture/examples/dt/dcn/control-plane/scaledown/
107-
```
107+
```
108+
109+
## Octavia with Availability Zones
110+
111+
When using Octavia with Availability Zones, it needs additional configuration for each AZ in the control plane during the post-Ceph deployment.
112+
113+
For instance, after deploying AZ1:
114+
115+
```yaml
116+
spec:
117+
octavia:
118+
enabled: true
119+
...
120+
lbMgmtNetwork:
121+
availabilityZoneCIDRs:
122+
az1: 172.34.0.0/16
123+
```
124+
125+
The availabilityZoneCIDRs setting creates the Octavia management networks that are used between the control plane and the Octavia Amphora VMs in remote AZs.

examples/dt/dcn/service-values.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,29 @@ data:
262262
network_vlan_ranges = datacentre:1:1000,leaf1:1:1000,leaf2:1:1000
263263
[neutron]
264264
physnets = datacentre,leaf1,leaf2
265+
266+
octavia:
267+
enabled: true
268+
template:
269+
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
270+
lbMgmtNetwork:
271+
createDefaultLbMgmtNetwork: false
272+
lbMgmtRouterGateway: 172.23.0.150
273+
availabilityZones:
274+
- az0
275+
octaviaAPI:
276+
networkAttachments:
277+
- internalapi
278+
octaviaHousekeeping:
279+
networkAttachments:
280+
- octavia
281+
octaviaHealthManager:
282+
networkAttachments:
283+
- octavia
284+
octaviaWorker:
285+
networkAttachments:
286+
- octavia
287+
265288
ovn:
266289
template:
267290
ovnController:
@@ -271,6 +294,9 @@ data:
271294
ovn-bridge: br-int
272295
ovn-encap-type: geneve
273296
system-id: random
297+
nicMappings:
298+
datacentre: ocpbr
299+
octavia: octbr
274300
nova:
275301
customServiceConfig: |
276302
[DEFAULT]

0 commit comments

Comments
 (0)