Skip to content

Commit 0c35a0d

Browse files
committed
DNM: test enable octavia in uni06zeta
1 parent a765ac8 commit 0c35a0d

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
lines changed

dt/uni06zeta/kustomization.yaml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ transformers:
2626
components:
2727
- ../../lib/control-plane
2828

29-
resources:
30-
- networking/resources/octavia-network-attachment-definition.yaml
31-
3229
replacements:
3330
- source:
3431
kind: ConfigMap
@@ -245,6 +242,18 @@ replacements:
245242
options:
246243
create: true
247244

245+
- source:
246+
kind: ConfigMap
247+
name: service-values
248+
fieldPath: data.ovn.ovnController.nicMappings
249+
targets:
250+
- select:
251+
kind: OpenStackControlPlane
252+
fieldPaths:
253+
- spec.ovn.template.ovnController.nicMappings
254+
options:
255+
create: true
256+
248257
- source:
249258
kind: ConfigMap
250259
name: service-values
@@ -256,3 +265,15 @@ replacements:
256265
- spec.neutron.template.customServiceConfig
257266
options:
258267
create: true
268+
269+
- source:
270+
kind: ConfigMap
271+
name: service-values
272+
fieldPath: data.heat.enabled
273+
targets:
274+
- select:
275+
kind: OpenStackControlPlane
276+
fieldPaths:
277+
- spec.heat.enabled
278+
options:
279+
create: true

dt/uni06zeta/networking/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ components:
2121
- ../../../lib/networking/nad
2222

2323
resources:
24-
- resources/octavia-network-attachment-definition.yaml
24+
- nad.yaml
2525

2626
replacements:
2727
- source:

examples/dt/uni06zeta/control-plane/networking/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

55
components:
6-
- ../../../../../dt/uni06zeta/networking/
6+
- ../../../../../dt/uni06zeta/networking
77

88
resources:
99
- nncp/values.yaml

examples/dt/uni06zeta/control-plane/networking/nncp/kustomization.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

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-
195
components:
206
- ../../../../../../dt/uni06zeta/nncp
217

examples/dt/uni06zeta/control-plane/service-values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,11 @@ data:
6262
swift:
6363
enabled: true
6464

65+
heat:
66+
enabled: true
67+
6568
octavia:
66-
enabled: false
69+
enabled: true
6770
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
6871
apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
6972
availabilityZones:

0 commit comments

Comments
 (0)