openstack/devstack
Code Issues Proposed changes

Prevent the use of 'swift' in ENABLED_SERVICES

Browse Source 
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
This commit is contained in:
Dean Troyer 2014-04-13 18:16:54 -05:00
parent b8071e9ba9
commit a79617c12a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stack.sh
View File

@ -149,6 +149,14 @@ if [[ ! ${DISTRO} =~ (precise|saucy|trusty|7.0|wheezy|sid|testing|jessie|f19|f20
fi fi
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, # Make sure we only have one rpc backend enabled,
# and the specified rpc backend is available on your platform. # and the specified rpc backend is available on your platform.
check_rpc_backend check_rpc_backend

7
stackrc
View File

@ -21,9 +21,9 @@ fi
# Specify which services to launch. These generally correspond to # Specify which services to launch. These generally correspond to
# screen tabs. To change the default list, use the ``enable_service`` and # screen tabs. To change the default list, use the ``enable_service`` and
# ``disable_service`` functions in ``localrc``. # ``disable_service`` functions in ``local.conf``.
# For example, to enable Swift add this to ``localrc``: # For example, to enable Swift add this to ``local.conf``:
# enable_service swift # enable_service s-proxy s-object s-container s-account
# In order to enable Neutron (a single node setup) add the following # In order to enable Neutron (a single node setup) add the following
# settings in `` localrc``: # settings in `` localrc``:
# disable_service n-net # disable_service n-net
@ -32,7 +32,6 @@ fi
# enable_service q-dhcp # enable_service q-dhcp
# enable_service q-l3 # enable_service q-l3
# enable_service q-meta # enable_service q-meta
# enable_service neutron
# # Optional, to enable tempest configuration as part of devstack # # Optional, to enable tempest configuration as part of devstack
# enable_service tempest # enable_service tempest