Reviewed: https:/ /review. opendev. org/c/openstack /python- openstackclient /+/932640
Committed: https:/ /opendev. org/openstack/ python- openstackclient /commit/ c6946f474353344 9b5b8a3db2b1a8f e099b842da
Submitter: "Zuul (22348)"
Branch: stable/2024.2

commit c6946f474353344 9b5b8a3db2b1a8f e099b842da
Author: Stephen Finucane <email address hidden>
Date: Tue Oct 15 17:41:50 2024 +0100

    clientmanager: Check for 'block-storage' service type

    This is a fun one driven by two separate changes. We recently started
    checking whether the volume service was available before setting quotas
    in order to allow us to use quota set for other services [1]. This
    merged a number of weeks ago and was included in 7.1.0. More recently,
    we modified DevStack to stop publishing a service catalog entry with a
    service type of 'volumev3', preferring instead to use the correct
    'block-storage' service type. Taken separately, neither of these changes
    would have caused issues. Together, they mean our lookups for the volume
    service now fail and we can't set volume quotas.

    Fix things by checking for the block-storage service type also. A future
    change will raise a warning (later an error) if the volume service is
    not found and you're attempting to set a quota since this is clearly a
    mistake.

    Change-Id: Ibbeef52225e187 57cd28d0fbfb14c 1ca06975b60
    Signed-off-by: Stephen Finucane <email address hidden>
    Closes-bug: #2084580
    (cherry picked from commit 7c6b47b451f30d1 d3965358c515baa e87955d7dc)