From a79617c12a7045156a98651de4203a388eb69e81 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Sun, 13 Apr 2014 18:16:54 -0500 Subject: [PATCH] Prevent the use of 'swift' in ENABLED_SERVICES This is not supported and we missed a comment in stackrc that still said otherwise. Fix the comment and abort in the sanity check section if 'swift' is detected in ENABLED_SERVICES. Change-Id: I78222d7ee2ea8a281962129d5bcf06c118469510 --- stack.sh | 8 ++++++++ stackrc | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/stack.sh b/stack.sh index 4f7b80e45d..dff6bd3cf1 100755 --- a/stack.sh +++ b/stack.sh @@ -149,6 +149,14 @@ if [[ ! ${DISTRO} =~ (precise|saucy|trusty|7.0|wheezy|sid|testing|jessie|f19|f20 fi fi +# Look for obsolete stuff +if [[ ,${ENABLED_SERVICES} =~ ,"swift" ]]; then + echo "FATAL: 'swift' is not supported as a service name" + echo "FATAL: Use the actual swift service names to enable tham as required:" + echo "FATAL: s-proxy s-object s-container s-account" + exit 1 +fi + # Make sure we only have one rpc backend enabled, # and the specified rpc backend is available on your platform. check_rpc_backend diff --git a/stackrc b/stackrc index 8320c9b1e1..f6403cce01 100644 --- a/stackrc +++ b/stackrc @@ -21,9 +21,9 @@ fi # Specify which services to launch. These generally correspond to # screen tabs. To change the default list, use the ``enable_service`` and -# ``disable_service`` functions in ``localrc``. -# For example, to enable Swift add this to ``localrc``: -# enable_service swift +# ``disable_service`` functions in ``local.conf``. +# For example, to enable Swift add this to ``local.conf``: +# enable_service s-proxy s-object s-container s-account # In order to enable Neutron (a single node setup) add the following # settings in `` localrc``: # disable_service n-net @@ -32,7 +32,6 @@ fi # enable_service q-dhcp # enable_service q-l3 # enable_service q-meta -# enable_service neutron # # Optional, to enable tempest configuration as part of devstack # enable_service tempest