Check for volumev2 and volumev3 too

If we don't check for all three possible Cinder service types, we may
end up with Cinder options hidden even when the service is in fact
available.

Change-Id: Ic844dc7d3b138b0918f9c436f0550fe0a4379bae
Closes-Bug: #1678534
(cherry picked from commit ed4cb76aa2)
This commit is contained in:
Jeremy Freudberg 2017-07-18 10:02:27 -04:00
parent c94e6c0a07
commit fed6bed040
1 changed files with 4 additions and 1 deletions

View File

@ -46,7 +46,10 @@ BASE_IMAGE_URL = "horizon:project:data_processing.clusters:register"
def is_cinder_enabled(request):
return saharaclient.base.is_service_enabled(request, 'volume')
for service in ['volumev3', 'volumev2', 'volume']:
if saharaclient.base.is_service_enabled(request, service):
return True
return False
def storage_choices(request):