[ci_gen_kustomize_values] BGP controlplane L3 separation templates

openstack-k8s-operators · Jan 29, 2025 · 18ba483 · 18ba483
1 parent e2e1465
commit 18ba483
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...omize_values/templates/bgp_dt01/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2 b/...omize_values/templates/bgp_dt01/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2
@@ -58,7 +58,7 @@ data:
             fixedIP: 100.65.{{ rack_number }}.{{ peer_suffix + 1 }}
           - name: BgpMainNet
             subnetName: subnet{{ rack_number }}
-            fixedIP: 172.30.{{ rack_number }}.{{ peer_suffix + 1 }}
+            fixedIP: 99.99.{{ rack_number }}.{{ peer_suffix + 1 }}
           - name: BgpMainNetV6
             subnetName: subnet{{ rack_number }}
             fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:00{{ (rack_number | int) + 1 }}{{ 2 if instance.startswith('compute') else 3 }}

diff --git a/roles/ci_gen_kustomize_values/templates/bgp_dt01/network-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/bgp_dt01/network-values/values.yaml.j2
@@ -107,19 +107,18 @@ data:
       {
         "cniVersion": "0.3.1",
         "name": "{{ network.network_name }}",
-{%  if network.network_name == "octavia" %}
         "type": "bridge",
-{%  else %}
-        "type": "macvlan",
-{%  endif %}
+        "isDefaultGateway": true,
+        "isGateway": true,
+        "forceAddress": false,
+        "ipMasq": true,
+        "hairpinMode": true,
 {%  if network.network_name == "octavia" %}
         "bridge": "octbr",
-{%  elif network.vlan_id is defined %}
-        "master": "{{ network.network_name }}",
 {%  elif network.network_name == "ctlplane" %}
-        "master": "ospbr",
+        "bridge": "ospbr",
 {%  else %}
-        "master": "{{ ns.interfaces[network.network_name] }}",
+        "bridge": "{{ network.network_name }}",
 {%  endif %}
         "ipam": {
           "type": "whereabouts",
@@ -135,7 +134,8 @@ data:
            ],
 {%  endif %}
           "range_start": "{{ network.tools.multus.ipv4_ranges.0.start }}",
-          "range_end": "{{ network.tools.multus.ipv4_ranges.0.end }}"
+          "range_end": "{{ network.tools.multus.ipv4_ranges.0.end }}",
+          "gateway": "{{ network.network_v4 |ansible.utils.nthhost(1) }}"
         }
       }
 {%  endif %}