Skip to content

Commit cb725cb

Browse files
Skip Manila verification when catalog JSON is empty.
OSPRH-34580 openstack catalog show manila -f json exits 0 with "{}" when the service is absent, so checking rc alone still runs check_manila.yml on 17.1 clouds without share. Co-authored-by: Cursor <cursoragent@cursor.com> Change-Id: I7c013aa3ac8eca9045468d792d24ac2feed878a6
1 parent cda89b5 commit cb725cb

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • collection/stages/roles/verification/tasks

collection/stages/roles/verification/tasks/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@
133133
when:
134134
- not _skip_health
135135
- installation_type != 'upi'
136-
- manila_enabled.rc == 0
136+
# catalog show -f json returns rc=0 and "{}" when the service is missing
137+
# (PR #32). Ansible when lists are not short-circuit; default empty JSON.
138+
- manila_enabled.rc == 0 and ((manila_enabled.stdout | default('{}', true) | from_json | length) > 0)
137139
- ceph_nfs_ready|default(true)|bool
138140
- edge_nova_az is not defined # Skip due to Openstack Manila is not supported at the Edge
139141
- not openshift_proxy_installation|default(false)|bool

0 commit comments

Comments
 (0)