commit dd8943b5365ebd455ec346c93fe0cb58cf903bad Merge: 2bdf22e 68d4c5e Author: Zuul Date: Thu Oct 15 12:06:49 2020 +0000 Merge "Add custom SSL CA Cert support for api.cinder.get_microversion" into stable/train diff --cc openstack_dashboard/api/cinder.py index 17a9f81,5eedb76..dde49a3 --- a/openstack_dashboard/api/cinder.py +++ b/openstack_dashboard/api/cinder.py @@@ -249,11 -267,15 +250,11 @@@ def cinderclient(request, version=None) def get_microversion(request, features): - for service_name in ('volume', 'volumev2', 'volumev3'): - try: - cinder_url = base.url_for(request, service_name) - break - except exceptions.ServiceCatalogException: - continue - else: + try: + version, cinder_url = _find_cinder_url(request) + except exceptions.ServiceCatalogException: return None - min_ver, max_ver = cinder_client.get_server_version(cinder_url) + min_ver, max_ver = _get_server_version(request, cinder_url) return microversions.get_microversion_for_features( 'cinder', features, api_versions.APIVersion, min_ver, max_ver)