Skip to content

Conversation

@bogdando
Copy link
Contributor

@bogdando bogdando commented Oct 29, 2025

  1. Configure additional DHCP host records for hybrid scenarios
    Full routing solution for hybrid scenarios involving virtual-media BMO, requires extra host record for hypervisor host pointing out to ocpbm bridge IP.

Add a playbook to create this record, which can be applied as a post_infra or pre-deploy hook. Note that neither _vm_records, nor cifmw_dnsmasq_host_record can't be used for this currently.

  1. Fix nova04delta cifmw_baremetal_hosts defaults
    Set the condition for cifmw_baremetal_hosts to be defined and non-empty in nova04delta template, which lets the nova04delta DT passing the architecture repo validation for building CI jobs.

  2. Do not repeat edpm services for nova04delta template
    Consume those from the base DT layer plus overrides in VAF job file, if any.

JIRA: OSPRH-18909

@bogdando bogdando requested a review from a team as a code owner October 29, 2025 16:43
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 29, 2025

[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.

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

@softwarefactory-project-zuul
Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/7ec1e98a2ae54adfb33cb7b44ed858bd

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 36m 48s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 54s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 22m 34s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 29s
cifmw-pod-pre-commit FAILURE in 6m 34s
✔️ build-push-container-cifmw-client SUCCESS in 19m 23s

@bogdando bogdando force-pushed the hybrid_setups branch 2 times, most recently from 02fb1c7 to f046123 Compare October 30, 2025 12:40
@bogdando bogdando requested a review from danpawlik October 30, 2025 12:58
@bogdando
Copy link
Contributor Author

We need this hook for VAF team hybrid setup full-routing solution for virtual-media.
We could improve this implementation by making cifmw_dnsmasq_host_record usable for taking extra args, instead of beinig internal variable transferring state from modules to modules during cifmw nested logic.

@softwarefactory-project-zuul
Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/2c06d56015aa4e5594ddb76710599991

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 47m 53s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 03s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 33m 26s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 27s
cifmw-pod-pre-commit FAILURE in 6m 32s
✔️ build-push-container-cifmw-client SUCCESS in 19m 05s

@bogdando
Copy link
Contributor Author

Folks, why ansible-playbook -i localhost, --syntax-check roles/ci_multus/molecule/default/nads_output.yml fails? I haven't touched this file in this PR

@bogdando
Copy link
Contributor Author

it also fails on main branch

@amartyasinha
Copy link
Contributor

recheck

@bogdando bogdando changed the title Configure additional DHCP host records for hybrid scenarios Configure additional DHCP host records for hybrid scenarios, fix nova04delta template Nov 4, 2025
@bogdando
Copy link
Contributor Author

bogdando commented Nov 4, 2025

we have tested this in testproject downstream

danpawlik
danpawlik previously approved these changes Nov 4, 2025
@softwarefactory-project-zuul
Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/d608b3f716b54724a236a71ff4706b27

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 39m 10s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 40s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 25m 18s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 39s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 45s
✔️ cifmw-pod-k8s-snippets-source SUCCESS in 4m 17s
cifmw-pod-pre-commit FAILURE in 8m 01s
✔️ cifmw-architecture-validate-hci SUCCESS in 4m 17s
✔️ build-push-container-cifmw-client SUCCESS in 19m 09s
✔️ cifmw-molecule-ci_gen_kustomize_values SUCCESS in 5m 46s

Full routing solution for hybrid scenarios involving virtual-media
BMO, requires extra host record for hypervisor host pointing out
to ocpbm bridge IP.

Add a playbook to create this record, which can be applied as a
post_infra hook. Note that neither _vm_records, nor
cifmw_dnsmasq_host_record can't be used for this currently.

Signed-off-by: Bohdan Dobrelia <[email protected]>
@hjensas
Copy link
Contributor

hjensas commented Nov 4, 2025

/lgtm

@bogdando
Copy link
Contributor Author

bogdando commented Nov 4, 2025

sorry, I pushed another fix on top

Copy link
Contributor

@danpawlik danpawlik left a comment

Choose a reason for hiding this comment

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

We can live without handlers here.

@hjensas
Copy link
Contributor

hjensas commented Nov 4, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 4, 2025
@evallesp evallesp merged commit 975ab76 into openstack-k8s-operators:main Nov 5, 2025
6 checks passed
@bogdando
Copy link
Contributor Author

bogdando commented Nov 5, 2025

/cherry-pick stable

@openshift-cherrypick-robot

@bogdando: new pull request created: #3459

In response to this:

/cherry-pick stable

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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.

6 participants