Skip to content

Commit fffa721

Browse files
mnietojiclaude
authored andcommitted
[ci_gen_kustomize_values] fix: Preserve nodes config from architecture repo in HCI template
When generating kustomize values for HCI deployments, preserve the complete node configuration (ansibleHost, networks, fixedIP) from the architecture repository instead of overwriting it with just hostName. This fixes the issue where pre-ceph nodeset correctly had fixedIP but post-ceph nodeset lost it because ci-framework template was overwriting the nodes section from architecture repo. Additionally, set cifmw_ceph_target to 'edpms' in dt-nfv HCI scenario to match the group name created by ceph-bm.yml playbook when iterating over OpenStackBaremetalSet spec.baremetalHosts keys (edpm-compute-*). Signed-off-by: Miguel Angel Nieto Jimenez <mnietoji@redhat.com> Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 2838c98 commit fffa721

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

roles/ci_gen_kustomize_values/templates/nfv-ovs-dpdk-sriov-hci/edpm-nodeset-values/values.yaml.j2

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ data:
3131
{% endif %}
3232
nodes:
3333
{% for instance in instances_names %}
34-
edpm-{{ instance }}:
35-
hostName: {{ instance }}
34+
{% set node_name = 'edpm-' + instance %}
35+
{{ node_name }}:
36+
{{ _original_nodes[node_name] | default({'hostName': instance}) | to_nice_yaml(indent=2) | indent(8, first=true) }}
3637
{% endfor %}
3738

3839
{% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and

scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-hci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ cifmw_lvms_disk_list:
117117
- /dev/vdb
118118
- /dev/vdc
119119

120+
cifmw_ceph_target: edpms
120121
cifmw_ceph_client_vars: /tmp/ceph_client.yml
121122
cifmw_ceph_client_values_post_ceph_path_src: >-
122123
{{ _arch_repo }}/examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/values.yaml

0 commit comments

Comments
 (0)