From 98b6c088b71da9cc0600f8c319d1e0eaa0f1dfa2 Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Mon, 7 Oct 2024 14:44:57 -0230 Subject: [PATCH] Add octavia nad customization to uni04delta-ipv6 Adds the routes override to the uni04delta ipv6 job --- .../network-values/values.yaml.j2 | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2 index 3b48d68758..4a103e1463 100644 --- a/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2 @@ -87,6 +87,31 @@ data: } } {% endif %} +{% if network.tools.multus is defined and network.network_name == "octavia" %} + net-attach-def: | + { + "cniVersion": "0.3.1", + "name": "octavia", + "type": "bridge", + "bridge": "octbr", + "ipam": { + "type": "whereabouts", + "range": "{{ network[_ipv.network_vX] }}", +{% if _ipv.ipvX_routes in network.tools.multus and network.tools.multus[_ipv.ipvX_routes] | length > 0 %} + "routes": [ +{% for route in network.tools.multus[_ipv.ipvX_routes] %} + { + "dst": "{{ route.destination }}", + "gw": "{{ route.gateway }}" + }{% if not loop.last %},{% endif %} +{% endfor %} + ], +{% endif %} + "range_start": "{{ network.tools.multus[_ipv.ipvX_ranges].0.start }}", + "range_end": "{{ network.tools.multus[_ipv.ipvX_ranges].0.end }}" + } + } +{% endif %} {% if network.tools.multus is defined and network.network_name == "ironic" %} net-attach-def: | { @@ -102,7 +127,7 @@ data: } } {% endif %} -{% if network.tools.multus is defined and network.network_name not in ["ctlplane", "ironic"] %} +{% if network.tools.multus is defined and network.network_name not in ["ctlplane", "ironic", "octavia"] %} net-attach-def: | { "cniVersion": "0.3.1",