Skip to content

Commit 97919f0

Browse files
mnietojiclaude
authored andcommitted
[ci_gen_kustomize_values] Add per-node bmhLabelSelector to prevent BMH shuffling
The OpenStackBaremetalSet operator assigns BMHs to nodeset hostnames non-deterministically (OSPRH-10282), causing compute-0 to get the network config of compute-1 and vice versa. Add bmhLabelSelector with nodeName per node so each edpm-compute-X is deterministically bound to the BMH named compute-X. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Signed-off-by: Miguel Angel Nieto Jimenez <mnietoji@redhat.com>
1 parent 5ef8fb8 commit 97919f0

10 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
nodes:
3333
{% for instance in instances_names %}
3434
{% set node_name = 'edpm-' + instance %}
35-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
35+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
3636
{{ node_name }}:
3737
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
3838
{% endfor %}

roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
nodes:
4646
{% for instance in instances_names %}
4747
{% set node_name = 'edpm-' + instance %}
48-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
48+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
4949
{{ node_name }}:
5050
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
5151
{% endfor %}

roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-2nodesets/edpm-nodeset2-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
nodes:
4646
{% for instance in instances_names %}
4747
{% set node_name = 'edpm-' + instance %}
48-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
48+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
4949
{{ node_name }}:
5050
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
5151
{% endfor %}

roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
nodes:
4646
{% for instance in instances_names %}
4747
{% set node_name = 'edpm-' + instance %}
48-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
48+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
4949
{{ node_name }}:
5050
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
5151
{% endfor %}

roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
nodes:
4646
{% for instance in instances_names %}
4747
{% set node_name = 'edpm-' + instance %}
48-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
48+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
4949
{{ node_name }}:
5050
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
5151
{% endfor %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
nodes:
3333
{% for instance in instances_names %}
3434
{% set node_name = 'edpm-' + instance %}
35-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
35+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
3636
{{ node_name }}:
3737
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
3838
{% endfor %}

roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-networker/edpm-common-nodeset-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ data:
4646
nodes:
4747
{% for instance in instance_names %}
4848
{% set node_name = 'edpm-' + instance %}
49-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
49+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
5050
{{ node_name }}:
5151
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
5252
{% endfor %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
nodes:
3333
{% for instance in instances_names %}
3434
{% set node_name = 'edpm-' + instance %}
35-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
35+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
3636
{{ node_name }}:
3737
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
3838
{% endfor %}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
nodes:
3333
{% for instance in instances_names %}
3434
{% set node_name = 'edpm-' + instance %}
35-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
35+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
3636
{{ node_name }}:
3737
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
3838
{% endfor %}

roles/ci_gen_kustomize_values/templates/sriov/edpm-nodeset-values/values.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data:
3232
nodes:
3333
{% for instance in instances_names %}
3434
{% set node_name = 'edpm-' + instance %}
35-
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance}) %}
35+
{% set node_config = _original_nodes[node_name] | default({}) | combine({'hostName': instance, 'bmhLabelSelector': {'nodeName': instance}}) %}
3636
{{ node_name }}:
3737
{{ node_config | to_nice_yaml(indent=2) | indent(8, first=true) }}
3838
{% endfor %}

0 commit comments

Comments
 (0)