Merge pull request #338 from eduolivares/bgp+octavia

[BGP_DT01] Enable octavia Depends-On: openstack-k8s-operators/ci-framework#2120 Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
openstack-k8s-operators · Oct 24, 2024 · 65b46e3 · 65b46e3
2 parents a0cf8f9 + 573df6a
commit 65b46e3
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 1 deletion.
diff --git a/automation/mocks/bgp_dt01.yaml b/automation/mocks/bgp_dt01.yaml
@@ -762,6 +762,9 @@ cifmw_networking_env_definition:
               start: 172.23.0.30
               start_host: 30
           ipv6_ranges: []
+          ipv4_routes:
+            - destination: "172.24.0.0/16"
+              gateway: "172.23.0.150"
         netconfig:
           ipv4_ranges:
             - end: 172.23.0.250

diff --git a/dt/bgp/kustomization.yaml b/dt/bgp/kustomization.yaml
@@ -257,6 +257,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
+
   - source:
       kind: ConfigMap
       name: service-values

diff --git a/examples/dt/bgp/bgp_dt01/control-plane/service-values.yaml b/examples/dt/bgp/bgp_dt01/control-plane/service-values.yaml
@@ -27,21 +27,33 @@ data:
     enabled: true
 
   octavia:
-    enabled: false
+    enabled: true
     amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image
     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:

diff --git a/examples/dt/bgp/control-plane/service-values.yaml b/examples/dt/bgp/control-plane/service-values.yaml
@@ -34,15 +34,28 @@ data:
     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: