openstack/devstack
Code Issues Proposed changes

Remove unused and deprecated SWIFT_CONFIG_DIR variable

Browse Source 
Change-Id: Id9b9f2300288b98e4952ef8da6732232a683338d
This commit is contained in:
JordanP 2014-11-20 18:06:23 +01:00
parent 576aaae6f7
commit a6dfe81998
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/guides/multinode-lab.rst
View File

@ -275,7 +275,7 @@ simple as enabling the ``swift`` service in ``local.conf``:
Swift will put its data files in ``SWIFT_DATA_DIR`` (default Swift will put its data files in ``SWIFT_DATA_DIR`` (default
``/opt/stack/data/swift``). The size of the data 'partition' created ``/opt/stack/data/swift``). The size of the data 'partition' created
(really a loop-mounted file) is set by ``SWIFT_LOOPBACK_DISK_SIZE``. The (really a loop-mounted file) is set by ``SWIFT_LOOPBACK_DISK_SIZE``. The
Swift config files are located in ``SWIFT_CONFIG_DIR`` (default Swift config files are located in ``SWIFT_CONF_DIR`` (default
``/etc/swift``). All of these settings can be overridden in (wait for ``/etc/swift``). All of these settings can be overridden in (wait for
it...) ``local.conf``. it...) ``local.conf``.

3
lib/swift
View File

@ -54,8 +54,7 @@ SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img
# Set ``SWIFT_CONF_DIR`` to the location of the configuration files. # Set ``SWIFT_CONF_DIR`` to the location of the configuration files.
# Default is ``/etc/swift``. # Default is ``/etc/swift``.
# TODO(dtroyer): remove SWIFT_CONFIG_DIR after cutting stable/grizzly SWIFT_CONF_DIR=${SWIFT_CONF_DIR:-/etc/swift}
SWIFT_CONF_DIR=${SWIFT_CONF_DIR:-${SWIFT_CONFIG_DIR:-/etc/swift}}
if is_service_enabled s-proxy && is_service_enabled swift3; then if is_service_enabled s-proxy && is_service_enabled swift3; then
# If we are using swift3, we can default the s3 port to swift instead # If we are using swift3, we can default the s3 port to swift instead