Skip to content

[libvirt_manager] Add parent_group key for libvirt layouts#3925

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
michburk:libvirt-parent-groups
Jun 16, 2026
Merged

[libvirt_manager] Add parent_group key for libvirt layouts#3925
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
michburk:libvirt-parent-groups

Conversation

@michburk

@michburk michburk commented May 11, 2026

Copy link
Copy Markdown
Contributor

Allow VM types to declare a parent_group so that multiple subgroups (e.g. compute1, compute2) are independently addressable while also being reachable via a shared parent inventory group (e.g. computes).

@openshift-ci

openshift-ci Bot commented May 11, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@michburk michburk marked this pull request as ready for review May 15, 2026 20:14
@michburk michburk requested a review from a team May 18, 2026 12:03

@nemarjan nemarjan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM in general, just some questions.

Comment thread roles/libvirt_manager/tasks/deploy_layout.yml Outdated
Comment thread roles/libvirt_manager/tasks/deploy_layout.yml Outdated
@michburk

Copy link
Copy Markdown
Contributor Author

Also added a check to the Craft patch for cifmw_networking_definition task to skip generating group-template entries for child VM types when their parent_group matches an existing VM type in the libvirt layout.

My testing used two child VM types (compute94 and compute96) both setting parent_group: computes, with no compute group defined in the libvirt layout. This worked fine and should be unaffected by this change (re-testing now).

Nemanja's comment prompted me to test a layout with both a regular compute type and a compute96 child with parent_group: computes. This failed because the old logic generated entries for both computes and compute96s with the same networks. Since parent_group adds compute96 nodes to the computes Ansible group, the networking mapper saw those nodes in two groups that both defined the same network and rejected the duplicate.

@michburk michburk marked this pull request as draft May 19, 2026 00:21
@michburk michburk force-pushed the libvirt-parent-groups branch 2 times, most recently from d202b36 to 8a9d4a5 Compare May 19, 2026 20:39
@michburk michburk force-pushed the libvirt-parent-groups branch from 8a9d4a5 to 3ff2f09 Compare May 26, 2026 20:39
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/4ad55471d45644209227aa1e5336099a

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 46m 24s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 26m 11s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 33m 22s
cifmw-crc-podified-edpm-baremetal-minor-update RETRY_LIMIT in 25m 46s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 19s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 29s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 41s
✔️ cifmw-molecule-libvirt_manager SUCCESS in 47m 40s
✔️ cifmw-molecule-reproducer SUCCESS in 13m 32s

@michburk

Copy link
Copy Markdown
Contributor Author

recheck

@michburk michburk force-pushed the libvirt-parent-groups branch from 3ff2f09 to ec67224 Compare May 27, 2026 17:09
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/87dfd351f88246a995cfa367513088ca

openstack-k8s-operators-content-provider FAILURE in 6m 31s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal-minor-update SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ cifmw-pod-zuul-files SUCCESS in 5m 09s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 10m 08s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 37s
cifmw-molecule-libvirt_manager FAILURE in 43m 22s
✔️ cifmw-molecule-reproducer SUCCESS in 15m 33s

@michburk michburk force-pushed the libvirt-parent-groups branch 3 times, most recently from 5c83861 to 4cf077d Compare May 27, 2026 20:42
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/8f0c3a495a1a4e29889893e615d64a89

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 16m 14s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 26m 58s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 28m 44s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 2h 01m 39s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 06s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 45s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 47s
cifmw-molecule-libvirt_manager FAILURE in 17m 27s
cifmw-molecule-reproducer FAILURE in 4m 53s

@michburk

Copy link
Copy Markdown
Contributor Author

recheck

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/018047d4c54545c19dfeeff81c6a8047

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 23m 56s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 30m 06s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 50m 27s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 2h 09m 17s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 39s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 36s
✔️ cifmw-pod-pre-commit SUCCESS in 9m 36s
cifmw-molecule-libvirt_manager FAILURE in 46m 29s
✔️ cifmw-molecule-reproducer SUCCESS in 14m 01s

@michburk

Copy link
Copy Markdown
Contributor Author

recheck

@michburk michburk force-pushed the libvirt-parent-groups branch 2 times, most recently from 7c13c92 to 372a52f Compare May 29, 2026 21:11
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/49ce4cb17964418cba82ad931c49182b

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 29m 30s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 31m 59s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 39m 12s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 2h 15m 34s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 33s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 04s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 22s
cifmw-molecule-libvirt_manager FAILURE in 8m 53s
cifmw-molecule-reproducer FAILURE in 6m 20s

@michburk michburk force-pushed the libvirt-parent-groups branch from 372a52f to ce3761e Compare June 4, 2026 16:37
@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/0a89dfa4ed8446458d448f94e3c39b34

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 50m 05s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 22m 19s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 32m 09s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 2h 13m 06s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 52s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 40s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 34s
cifmw-molecule-libvirt_manager FAILURE in 21m 37s
✔️ cifmw-molecule-reproducer SUCCESS in 13m 58s

@michburk michburk force-pushed the libvirt-parent-groups branch 7 times, most recently from 24316c2 to c179401 Compare June 11, 2026 19:21
@michburk michburk force-pushed the libvirt-parent-groups branch 2 times, most recently from 99532e0 to ff0954a Compare June 12, 2026 18:55
@michburk michburk marked this pull request as ready for review June 12, 2026 18:55
Allow VM types to declare a parent_group so that multiple
subgroups (e.g. compute1, compute2) are independently
addressable while also being reachable via a shared parent
inventory group (e.g. computes).

Generated-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Michael Burke <michburk@redhat.com>

@evallesp evallesp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

{{ _names }}
_reserved_groups:
- hypervisors
- localhosts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(non-blocking) suggestion: Maybe for a following patch, but It'd be good to have here crcs.
It seems it won't collide if: "parent_ansible_group: crcs" as crc goes to ocps

But I'd not stop merging this and need to run the hwole tests again

@Valkyrie00 Valkyrie00 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci

openshift-ci Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Valkyrie00

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit 5de0766 into openstack-k8s-operators:main Jun 16, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants