Skip to content

Skip Manila checks when catalog show returns empty JSON #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
imatza-rh wants to merge 5 commits into from
Closed

Skip Manila checks when catalog show returns empty JSON #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8581163
Fix Swift registry check using wrong separator in object name search
imatza-rh Aug 31, 2026
60ae7e2
Skip Manila verification when catalog JSON is empty.
imatza-rh Sep 5, 2026
0a289e4
Remove OCPBUGS-67159 workaround and enable openstack_test
imatza-rh Aug 5, 2026
48fe0b8
Skip pull secret extraction when pre-populated
imatza-rh Aug 10, 2026
9b4ef43
Run openstack_test after adoption verification
imatza-rh Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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 <imatza@redhat.com>
  • Loading branch information
@imatza-rh
imatza-rh committed Sep 8, 2026
commit 0a289e44459b13ea77d5fdde414fbf5664e36d84
5 changes: 0 additions & 5 deletions collection/stages/roles/install/templates/install-config-ipi.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,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 }}"
Expand Down
2 changes: 2 additions & 0 deletions collection/stages/roles/openstack_test/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -52,3 +53,4 @@
tasks_from: restore.yml
delegate_to: "{{ hypervisor }}"
remote_user: root
when: hypervisor is defined
8 changes: 1 addition & 7 deletions jobs_definitions/adoption.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"