From d0ba31dc98d72f00f309ce89827b9c24d38ae0d9 Mon Sep 17 00:00:00 2001 From: Itay Matza Date: Wed, 5 Aug 2026 13:04:34 +0300 Subject: [PATCH] Remove OCPBUGS-67159 workaround and enable openstack_test 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 --- .../roles/install/templates/install-config-ipi.yaml.j2 | 5 ----- collection/stages/roles/openstack_test/tasks/main.yml | 2 ++ jobs_definitions/adoption.yaml | 8 +------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 b/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 index fa62c376..d5c4c10c 100644 --- a/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 +++ b/collection/stages/roles/install/templates/install-config-ipi.yaml.j2 @@ -59,11 +59,6 @@ platform: - subnet: name: "{{ installcfg_subnet.name }}" {%- else +%} - {%- if ocp_deployment_topology.api_vip is defined +%} - # Workaround for OCPBUGS-67159 (adoption uses pre-existing VIPs, not FIPs) - apiVIPs: ["{{ ocp_deployment_topology.api_vip }}"] - ingressVIPs: ["{{ ocp_deployment_topology.ingress_vip }}"] - {%- endif +%} externalNetwork: "{{ installcfg_external_network }}" apiFloatingIP: "{{ installcfg_api_floating_ip }}" ingressFloatingIP: "{{ installcfg_ingress_floating_ip }}" diff --git a/collection/stages/roles/openstack_test/tasks/main.yml b/collection/stages/roles/openstack_test/tasks/main.yml index 0eaa57ce..8275f95d 100644 --- a/collection/stages/roles/openstack_test/tasks/main.yml +++ b/collection/stages/roles/openstack_test/tasks/main.yml @@ -31,6 +31,7 @@ - "{{ resources.apps_accessible_ip }}" delegate_to: "{{ hypervisor }}" remote_user: root + when: hypervisor is defined - name: Include Openstack-Test tasks ansible.builtin.include_tasks: run_openstack_test.yml @@ -52,3 +53,4 @@ tasks_from: restore.yml delegate_to: "{{ hypervisor }}" remote_user: root + when: hypervisor is defined diff --git a/jobs_definitions/adoption.yaml b/jobs_definitions/adoption.yaml index feafc385..fab752bd 100644 --- a/jobs_definitions/adoption.yaml +++ b/jobs_definitions/adoption.yaml @@ -8,10 +8,7 @@ stages: - install - post - verification - # openstack_test delegates DNS tasks to the hypervisor via - # tools_cifmw_dnsmasq, which is unreachable from the adoption - # container context. Tracked in OSPRH-27365. - # - openstack_test + - openstack_test # Removed LB tests until Octavia is supported and enabled in adoption jobs # - lb_tests @@ -45,6 +42,3 @@ ocp_deployment_topology: servergroups: master: "soft-anti-affinity" # Required if number of computes < 3, otherwise can be anti-affinity worker: "soft-anti-affinity" # Required if number of computes < 3, otherwise can be anti-affinity - # Workaround for OCPBUGS-67159 - api_vip: "10.196.0.15" - ingress_vip: "10.196.0.17"