summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Freudberg <jeremyfreudberg@gmail.com>2017-07-18 10:02:27 -0400
committerJeremy Freudberg <jeremyfreudberg@gmail.com>2017-08-14 14:50:06 +0000
commitfed6bed0409f7c52426391b29ea73f3355bf190d (patch)
tree5ca0f7887aad48697321e2402eff6e302ac062f0
parentc94e6c0a0786cccce285b737c2f40227e21e8559 (diff)
Check for volumev2 and volumev3 toonewton-eol5.0.2
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)
Notes
Notes (review): Code-Review+1: Luigi Toscano <ltoscano@redhat.com> Code-Review+2: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Workflow+1: Telles Mota Vidal Nóbrega <tenobreg@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 14 Aug 2017 17:02:06 +0000 Reviewed-on: https://review.openstack.org/493570 Project: openstack/sahara-dashboard Branch: refs/heads/stable/newton
-rw-r--r--sahara_dashboard/content/data_processing/clusters/nodegroup_templates/workflows/create.py5
1 files changed, 4 insertions, 1 deletions
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 769fbe6..bbd1b0a 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"
46 46
47 47
48def is_cinder_enabled(request): 48def is_cinder_enabled(request):
49 return saharaclient.base.is_service_enabled(request, 'volume') 49 for service in ['volumev3', 'volumev2', 'volume']:
50 if saharaclient.base.is_service_enabled(request, service):
51 return True
52 return False
50 53
51 54
52def storage_choices(request): 55def storage_choices(request):