From 3bc41b1c67f1010a382505730751eec93c6339d0 Mon Sep 17 00:00:00 2001 From: "softwarefactory-project-zuul[bot]" <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:39:18 +0000 Subject: [PATCH 1/2] Merge pull request #335 from beagles/dnm-enable-octavia Enable Octavia in Uni01alpha Enable services for octavia Reviewed-by: John Fulton --- examples/dt/uni01alpha/control-plane/service-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml index 636d6eafc..fd340e1d8 100644 --- a/examples/dt/uni01alpha/control-plane/service-values.yaml +++ b/examples/dt/uni01alpha/control-plane/service-values.yaml @@ -91,7 +91,7 @@ data: enabled: true octavia: - enabled: false + enabled: true amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest availabilityZones: From c66038e9c297d2892a8b98db209a47008f3735f4 Mon Sep 17 00:00:00 2001 From: "softwarefactory-project-zuul[bot]" <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:18:04 +0000 Subject: [PATCH 2/2] Merge pull request #367 from lavraham/uni07eta_octavia Enable Octavia in uni07eta Reviewed-by: Andrew Bays --- dt/uni07eta/kustomization.yaml | 48 +++++++++++++++++++ .../uni07eta/control-plane/nncp/values.yaml | 8 +++- .../control-plane/service-values.yaml | 20 +++++++- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/dt/uni07eta/kustomization.yaml b/dt/uni07eta/kustomization.yaml index 61e8711d3..02edcaa3f 100644 --- a/dt/uni07eta/kustomization.yaml +++ b/dt/uni07eta/kustomization.yaml @@ -269,6 +269,54 @@ replacements: options: create: true + - source: + kind: ConfigMap + name: service-values + fieldPath: data.octavia.octaviaAPI.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.octavia.template.octaviaAPI.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.octavia.octaviaHealthManager.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.octavia.template.octaviaHealthManager.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.octavia.octaviaHousekeeping.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.octavia.template.octaviaHousekeeping.customServiceConfig + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.octavia.octaviaWorker.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.octavia.template.octaviaWorker.customServiceConfig + options: + create: true + # OVN - source: diff --git a/examples/dt/uni07eta/control-plane/nncp/values.yaml b/examples/dt/uni07eta/control-plane/nncp/values.yaml index 78bcebc1f..ae8cb6f69 100644 --- a/examples/dt/uni07eta/control-plane/nncp/values.yaml +++ b/examples/dt/uni07eta/control-plane/nncp/values.yaml @@ -172,7 +172,13 @@ data: "type": "whereabouts", "range": "172.23.0.0/24", "range_start": "172.23.0.30", - "range_end": "172.23.0.70" + "range_end": "172.23.0.70", + "routes": [ + { + "dst": "172.24.0.0/16", + "gw": "172.23.0.150" + } + ] } } diff --git a/examples/dt/uni07eta/control-plane/service-values.yaml b/examples/dt/uni07eta/control-plane/service-values.yaml index b4da8d2fb..1a110c429 100644 --- a/examples/dt/uni07eta/control-plane/service-values.yaml +++ b/examples/dt/uni07eta/control-plane/service-values.yaml @@ -65,21 +65,37 @@ data: octavia: - enabled: false - amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image + enabled: true + # Workaround for https://issues.redhat.com/browse/OSPRH-9102 + # There's a bug in uni-epsilon, the octavia-operator uploads a qcow2 image + # to glance but a pre-tests task updates the properties of a cinder volume. + # This update fails because the default volume type is already in use. + amphoraImageContainerImage: "" apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest octaviaAPI: networkAttachments: - internalapi + customServiceConfig: | + [controller_worker] + loadbalancer_topology=ACTIVE_STANDBY octaviaHousekeeping: networkAttachments: - octavia + customServiceConfig: | + [controller_worker] + loadbalancer_topology=ACTIVE_STANDBY octaviaHealthManager: networkAttachments: - octavia + customServiceConfig: | + [controller_worker] + loadbalancer_topology=ACTIVE_STANDBY octaviaWorker: networkAttachments: - octavia + customServiceConfig: | + [controller_worker] + loadbalancer_topology=ACTIVE_STANDBY ovn: ovnController: