From 8e8b93080da9f1341c4bd950f740f57356fce9bf Mon Sep 17 00:00:00 2001 From: Jeremy Freudberg Date: Tue, 18 Jul 2017 10:02:27 -0400 Subject: [PATCH] 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 ed4cb76aa2e5b00f1671d9dbcbc5a8dda589365a) --- .../clusters/nodegroup_templates/workflows/create.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/workflows/create.py b/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/workflows/create.py index 1514867d..e6e16a84 100644 --- a/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/workflows/create.py +++ b/sahara_dashboard/content/data_processing/clusters/nodegroup_templates/workflows/create.py @@ -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):