Skip Manila checks when catalog show returns empty JSON - #39
Draft
imatza-rh wants to merge 2 commits into
Draft
Conversation
The JSON-output migration in commit 1540a56 changed the Swift object search from grep (where '.' matches any character including '/') to jq contains() (where '.' is a literal dot). This caused the search target 'swift-check-NNNN.fooapp' to never match the actual Swift object paths which use '/' as separator: files/docker/registry/v2/repositories/swift-check-NNNN/fooapp/... Change the target separator from '.' to '/' to match the actual object name structure in Swift. Verified on live environment: old pattern matched 0 objects, new pattern correctly matches 7 objects. Fixes regression from 1540a56 (Harden verification OpenStack CLI calls to use JSON output). Assisted-By: Claude Code Signed-off-by: Itay Matza <imatza@redhat.com>
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
|
[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 |
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.
Why
openstack catalog show manila -f jsonexits 0 with stdout{}when the service is missing (stderr:service manila not found). After PR #32 switched this check from-c nameto-f json,when: manila_enabled.rc == 0still includescheck_manila.yml.That failed shiftstack adoption on a 17.1 cloud with no share service: tp !2579 build
fcec78ca/ OSPRH-34580.Live titan35 (2026-09-05): catalog list has no manila/share;
catalog show nova -f jsonis a 4-key object; missing manila is{}.Change
Require non-empty parsed JSON as well as
rc == 0.default('{}', true)so empty stdout cannot crash thewhen(Ansible does not short-circuit the list).This branch also carries the rebased Swift matcher from #37 (
ns.image→ns/image) plus currentmain(PR #36). Pinpull/N/headof this PR for adoption CI — onecifmw_shiftstack_qa_change_refcannot pin two PRs.Do not merge until the adoption skip-ahead chain is green.
Made with Cursor