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
diff --git a/stack.sh b/stack.sh
index 4f7b80e..dff6bd3 100755
--- a/stack.sh
+++ b/stack.sh
@@ -149,6 +149,14 @@
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 8320c9b..f6403cc 100644
--- a/stackrc
+++ b/stackrc
@@ -21,9 +21,9 @@
# 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 @@
# 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