Merge pull request #397 from lavraham/18.0.0-proposed

Merge pull request Enable Octavia in uni01alpha and uni07eta jobs Enable Octavia in Uni01alpha Enable services for octavia Reviewed-by: John Fulton [email protected] Reviewed-by: John Fulton <[email protected]>
openstack-k8s-operators · Sep 16, 2024 · dbccc84 · dbccc84
2 parents 274fdfe + c66038e
commit dbccc84
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 4 deletions.
diff --git 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/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:

diff --git 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
@@ -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: