commit 3381e09f72e7edbf39080893212b533b8e01a3a9
author Sergey Lukjanov <slukjanov@mirantis.com> Wed Jul 01 14:20:23 2015 +0300
committer Sergey Lukjanov <slukjanov@mirantis.com> Wed Jul 01 16:09:56 2015 +0000
tree cbf50f839776758eae779780965b960028b96fc4
parent 85a1c488dfda0094238f899ea0bf693106021ce5

Move Sahara into in-tree plugin

Once the Sahara related code moved to Sahara repo and used, we can
remove Sahara specific code from Devstack.

Partial-Implements: bp sahara-devstack-intree

Change-Id: I34412b5cb2e86944b8555b8fd04b43556eb2bbe6
Depends-on: I2e00b2ebc59dd3be6a0539dea2985f2e801a1bd7
Depends-on: I07c3fede473030e8a110cbf5a08309f890905abf

stack.sh

diff --git a/stack.sh b/stack.sh
index 591c0dc..1f355e5 100755
--- a/stack.sh
+++ b/stack.sh
@@ -505,7 +505,7 @@
 check_rpc_backend
 
 # Service to enable with SSL if ``USE_SSL`` is True
-SSL_ENABLED_SERVICES="key,nova,cinder,glance,s-proxy,neutron,sahara"
+SSL_ENABLED_SERVICES="key,nova,cinder,glance,s-proxy,neutron"
 
 if is_service_enabled tls-proxy && [ "$USE_SSL" == "True" ]; then
     die $LINENO "tls-proxy and SSL are mutually exclusive"