Skip to content

Commit 6145381

Browse files
rabiopenshift-merge-bot[bot]
authored andcommitted
[ci_gen_kustomize_values]: Add bmo01 nodes generation to nodeset-values template
The bmo01 dataplane nodesets now require `data.nodeset0.nodes` and `data.nodeset1.nodes` in the `nodeset-values` ConfigMap. Without these fields, kustomize replacements fail when generating the OpenStackDataPlaneNodeSet resources. Add Jinja2 loops that iterate over `leaf0-*` and `leaf1-*` instances from `cifmw_networking_env_definition` to generate the per-nodeset `nodes` blocks with `ansibleHost`, `bmhLabelSelector`, `hostName`, `networkData`, and network definitions for each compute node. Change-Id: I76e49722ecc2006205a9e764bc8a3211b7dda2af Signed-off-by: rabi <ramishra@redhat.com>
1 parent 0de9206 commit 6145381

1 file changed

Lines changed: 54 additions & 0 deletions

File tree

  • roles/ci_gen_kustomize_values/templates/bmo01/nodeset-values

roles/ci_gen_kustomize_values/templates/bmo01/nodeset-values/values.yaml.j2

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,33 @@ data:
1414
# install rhos-release repos
1515
dnf --nogpgcheck install -y {{ cifmw_repo_setup_rhos_release_rpm }}
1616
rhos-release {{ cifmw_repo_setup_rhos_release_args }}
17+
nodes:
18+
{% for host in cifmw_networking_env_definition.instances.keys() if host is match('^leaf0-.*') %}
19+
{% set idx = host.split('-')[1] %}
20+
{% set compute_name = 'edpm-compute-0-' ~ idx %}
21+
{% set ip = cifmw_networking_env_definition.instances[host].networks.ctlplane1.ip_v4 %}
22+
{% set ctlplane_ip = cifmw_networking_env_definition.instances[host].networks.ctlplane.ip_v4 | default(ip) %}
23+
{{ compute_name }}:
24+
ansible:
25+
ansibleHost: {{ ctlplane_ip }}
26+
bmhLabelSelector:
27+
nodeName: {{ host }}
28+
hostName: {{ compute_name }}
29+
networkData:
30+
name: {{ compute_name }}-network-data
31+
namespace: openstack
32+
networks:
33+
- defaultRoute: true
34+
fixedIP: {{ ip }}
35+
name: ctlplane
36+
subnetName: subnet2
37+
- name: internalapi
38+
subnetName: subnet2
39+
- name: storage
40+
subnetName: subnet2
41+
- name: tenant
42+
subnetName: subnet2
43+
{% endfor %}
1744
nodeset1:
1845
timesync_ntp_servers:
1946
- hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
@@ -27,3 +54,30 @@ data:
2754
# install rhos-release repos
2855
dnf --nogpgcheck install -y {{ cifmw_repo_setup_rhos_release_rpm }}
2956
rhos-release {{ cifmw_repo_setup_rhos_release_args }}
57+
nodes:
58+
{% for host in cifmw_networking_env_definition.instances.keys() if host is match('^leaf1-.*') %}
59+
{% set idx = host.split('-')[1] %}
60+
{% set compute_name = 'edpm-compute-1-' ~ idx %}
61+
{% set ip = cifmw_networking_env_definition.instances[host].networks.ctlplane2.ip_v4 %}
62+
{% set ctlplane_ip = cifmw_networking_env_definition.instances[host].networks.ctlplane.ip_v4 | default(ip) %}
63+
{{ compute_name }}:
64+
ansible:
65+
ansibleHost: {{ ctlplane_ip }}
66+
bmhLabelSelector:
67+
nodeName: {{ host }}
68+
hostName: {{ compute_name }}
69+
networkData:
70+
name: {{ compute_name }}-network-data
71+
namespace: openstack
72+
networks:
73+
- defaultRoute: true
74+
fixedIP: {{ ip }}
75+
name: ctlplane
76+
subnetName: subnet3
77+
- name: internalapi
78+
subnetName: subnet3
79+
- name: storage
80+
subnetName: subnet3
81+
- name: tenant
82+
subnetName: subnet3
83+
{% endfor %}

0 commit comments

Comments
 (0)