From a6dfe8199831019a53c937aa7f1f85549bb268e7 Mon Sep 17 00:00:00 2001 From: JordanP Date: Thu, 20 Nov 2014 18:06:23 +0100 Subject: [PATCH] Remove unused and deprecated SWIFT_CONFIG_DIR variable Change-Id: Id9b9f2300288b98e4952ef8da6732232a683338d --- doc/source/guides/multinode-lab.rst | 2 +- lib/swift | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst index 44601d8713..ff81c93975 100644 --- a/doc/source/guides/multinode-lab.rst +++ b/doc/source/guides/multinode-lab.rst @@ -275,7 +275,7 @@ simple as enabling the ``swift`` service in ``local.conf``: Swift will put its data files in ``SWIFT_DATA_DIR`` (default ``/opt/stack/data/swift``). The size of the data 'partition' created (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 it...) ``local.conf``. diff --git a/lib/swift b/lib/swift index ae0874ebdf..9e61331404 100644 --- a/lib/swift +++ b/lib/swift @@ -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. # Default is ``/etc/swift``. -# TODO(dtroyer): remove SWIFT_CONFIG_DIR after cutting stable/grizzly -SWIFT_CONF_DIR=${SWIFT_CONF_DIR:-${SWIFT_CONFIG_DIR:-/etc/swift}} +SWIFT_CONF_DIR=${SWIFT_CONF_DIR:-/etc/swift} 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