Skip to content

Commit f39492f

Browse files
committed
DNM: test enable octavia in uni06zeta
1 parent 343cdf7 commit f39492f

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
@@ -281,6 +278,18 @@ replacements:
281278
options:
282279
create: true
283280

281+
- source:
282+
kind: ConfigMap
283+
name: service-values
284+
fieldPath: data.ovn.ovnController.nicMappings
285+
targets:
286+
- select:
287+
kind: OpenStackControlPlane
288+
fieldPaths:
289+
- spec.ovn.template.ovnController.nicMappings
290+
options:
291+
create: true
292+
284293
- source:
285294
kind: ConfigMap
286295
name: service-values
@@ -292,3 +301,15 @@ replacements:
292301
- spec.neutron.template.customServiceConfig
293302
options:
294303
create: true
304+
305+
- source:
306+
kind: ConfigMap
307+
name: service-values
308+
fieldPath: data.heat.enabled
309+
targets:
310+
- select:
311+
kind: OpenStackControlPlane
312+
fieldPaths:
313+
- spec.heat.enabled
314+
options:
315+
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
@@ -68,8 +68,11 @@ data:
6868
swiftRing:
6969
ringReplicas: 1
7070

71+
heat:
72+
enabled: true
73+
7174
octavia:
72-
enabled: false
75+
enabled: true
7376
amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
7477
apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest
7578
availabilityZones:

0 commit comments

Comments
 (0)