Fix multi-cell edpm_nodes generation in adoption_vars template#3870
Fix multi-cell edpm_nodes generation in adoption_vars template#3870ashu-011 wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
| # Generates edpm_nodes with cell structure based on existing groups | ||
| edpm_nodes: | ||
| {% for group_name in _cell_compute_groups | sort %} | ||
| {%- if group_name != 'osp-computes' -%} |
There was a problem hiding this comment.
this drops nodes when osp-computes coexists with cellN-osp-computes. Should be fine if we don't test this in CI (the product doesn't support placing computes in the control plane stack AFAIK)
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/05e114e6a6e441878d87b0a16fe72749 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 47s |
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c22d0f586265482bb5f48a7cd67af97e ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 04m 52s |
bogdando
left a comment
bogdando
left a comment
There was a problem hiding this comment.
Good, the test project has passed. LGTM
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/247b73b1146c4d259c7e1f47072fe5cf ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 15m 47s |
ashu-011
force-pushed
the
fix_multicell
branch
3 times, most recently
from
749e391 to
3ed845e
Compare
|
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/015783cbdaa244d5a153bb6980dfb8d8 ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 15m 32s |
ashu-011
force-pushed
the
fix_multicell
branch
2 times, most recently
from
40f545b to
3d21470
Compare
…n_vars template The template logic was broken for multi-cell scenarios since commit 78bf394, which replaced the multi-cell-aware loop with single-cell-only logic that only checked for 'osp-computes' group. This fix restores the original _stack_names-driven approach that: - Loops through stacks (overcloud, cell1, cell2, etc.) - Uses appropriate prefix for each stack ('' for overcloud, 'cell1-' for cell1) - Generates edpm_nodes with nested cell structure - Works for both single-cell and multi-cell scenarios - Maintains consistency with source_mariadb_ip and source_galera_members Also adds molecule test with multi-cell fixtures to verify the logic and prevent future breakages. Fixes: 78bf394 ("Add support for distributed DCN/AZ deployments") Signed-off-by: Ashish Gupta <ashigupt@redhat.com>
2 participants
[adoption_osp_deploy] Fix multi-cell edpm_nodes generation in adoption_vars template
The template logic was broken for multi-cell scenarios since commit 78bf394,
which replaced the multi-cell-aware loop with single-cell-only logic that only
checked for 'osp-computes' group.
This fix restores the original _stack_names-driven approach that:
Backward compatibility:
Also adds molecule test for multi-cell fixtures to
verify the logic and prevent future breakages.