From 417f963e8d7e46cbc51859f0e536adbdd22e647a Mon Sep 17 00:00:00 2001 From: Miguel Angel Nieto Jimenez Date: Fri, 8 May 2026 12:59:29 +0200 Subject: [PATCH] [ci_gen_kustomize_values] fix: Preserve nodes config from architecture repo in all NFV templates Extend the fix from fffa7217 (HCI template) to all remaining NFV templates. Preserve the complete node configuration (ansibleHost, networks, fixedIP) from the architecture repository instead of overwriting it with just hostName. Affected templates: ovs-dpdk, ovs-dpdk-sriov, ovs-dpdk-sriov-ipv6, sriov, ovs-dpdk-sriov-2nodesets, ovs-dpdk-sriov-ipv6-2nodesets, and ovs-dpdk-sriov-networker. Signed-off-by: Miguel Angel Nieto Jimenez Co-Authored-By: Claude Opus 4.6 (1M context) --- .../edpm-nodeset-values/values.yaml.j2 | 3 ++- .../edpm-nodeset-values/values.yaml.j2 | 6 ++++-- .../edpm-nodeset2-values/values.yaml.j2 | 6 ++++-- .../edpm-nodeset-values/values.yaml.j2 | 6 ++++-- .../edpm-nodeset2-values/values.yaml.j2 | 6 ++++-- .../ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 | 6 ++++-- .../edpm-common-nodeset-values/values.yaml.j2 | 6 ++++-- .../ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 | 6 ++++-- .../templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 | 6 ++++-- .../templates/sriov/edpm-nodeset-values/values.yaml.j2 | 6 ++++-- 10 files changed, 38 insertions(+), 19 deletions(-) diff --git a/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2 index 9f46f5c6b..879d949ff 100644 --- a/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2 @@ -32,8 +32,9 @@ data: nodes: {% for instance in instances_names %} {% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} {{ node_name }}: -{{ _original_nodes[node_name] | default({'hostName': instance}) | to_nice_yaml(indent=2) | indent(8, first=true) }} +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2 index 3ddf4b7dc..9b75cc7e7 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2 @@ -44,8 +44,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2 index 6e2109bc5..8e6c5b7bb 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2 @@ -44,8 +44,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 index 8fca35bd0..b166ce872 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 @@ -44,8 +44,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 index 80103686c..a3bb0e28e 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 @@ -44,8 +44,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 index 3c4278102..5f608e64c 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 @@ -31,8 +31,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 index 9961a6fe5..937e86f54 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2 @@ -45,8 +45,10 @@ data: {% endif %} nodes: {% for instance in instance_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 index 110b4007e..ab1c12103 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov/edpm-nodeset-values/values.yaml.j2 @@ -31,8 +31,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 index 131b9b350..7204c800e 100644 --- a/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/ovs-dpdk/edpm-nodeset-values/values.yaml.j2 @@ -31,8 +31,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services) %} diff --git a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 index 0eadba79f..e2d1aaed0 100644 --- a/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 +++ b/roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2 @@ -31,8 +31,10 @@ data: {% endif %} nodes: {% for instance in instances_names %} - edpm-{{ instance }}: - hostName: {{ instance }} +{% set node_name = 'edpm-' + instance %} +{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %} + {{ node_name }}: +{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }} {% endfor %} {% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services) %}