Remove OCPBUGS-67159 workaround and enable openstack_test - #30
Draft
imatza-rh wants to merge 1 commit into
Draft
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 |
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
August 5, 2026 10:20
a3a26e1 to
8eadd43
Compare
imatza-rh
changed the title
OCPBUGS-67159 (IP/port collision in CAPO machine network) is fixed upstream and backported to OCP 4.19-4.22. Remove the hardcoded api_vip/ingress_vip workaround from adoption.yaml and the conditional VIP injection block from the IPI install-config template. Also enable the openstack_test stage for the adoption pipeline, previously disabled because tools_cifmw_dnsmasq delegates DNS tasks to the hypervisor which is unreachable from the adoption container. Guard both dnsmasq tasks with "when: hypervisor is defined" so the role gracefully skips DNS configuration in container-only environments while the actual openstack-tests still execute. Closes: OSPRH-25360 Ref: OSPRH-27365 Assisted-By: Claude Code Change-Id: Ie86f127a966d6017da46540defbfc49586b6cd91 Signed-off-by: Itay Matza <imatza@redhat.com>
imatza-rh
force-pushed
the
remove-ocpbugs-67159-workaround
branch
from
August 5, 2026 18:15
8eadd43 to
d0ba31d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two adoption pipeline improvements in one PR, validated in a single CI run:
1. Remove OCPBUGS-67159 workaround (OSPRH-25360)
The upstream OCP bug (IP/port collision in CAPO machine network) is fixed and backported to 4.19-4.22. Removes the hardcoded api_vip/ingress_vip from adoption.yaml and the conditional VIP injection block from the IPI install-config template.
2. Enable openstack_test stage (OSPRH-27365)
The openstack_test stage was disabled because tools_cifmw_dnsmasq delegates DNS tasks to the hypervisor, which is unreachable from the adoption container. Added when: hypervisor is defined guards to both dnsmasq tasks (add + restore) so the role gracefully skips DNS configuration in container-only environments. The actual openstack-tests still execute - only the APPS DNS entry on the hypervisor is skipped.
Files changed:
Testing
Needs an adoption pipeline CI run to verify both changes together.
References