Swift updates:

* Shut down swift in stop-base
* Save base swift config files
This commit is contained in:
Dean Troyer 2013-02-20 14:05:49 -06:00
parent 67cf5cecc6
commit b9fcf5442f
2 changed files with 11 additions and 0 deletions

View File

@ -39,6 +39,11 @@ if [[ -n "$SCREEN" ]]; then
fi
fi
# Swift runs daemons
if is_service_enabled swift; then
swift-init all stop 2>/dev/null || true
fi
# Handle iSCSI targets here...don't delete, just stop
if [[ "$os_PACKAGE" = "deb" ]]; then
stop_service tgt

View File

@ -71,6 +71,12 @@ SERVICE_TOKEN=${SERVICE_TOKEN:-aa-token-bb}
source $TARGET_DEVSTACK_DIR/lib/keystone
source $TARGET_DEVSTACK_DIR/lib/swift
SWIFT_CONFIG_PROXY_SERVER=${SWIFT_CONFIG_DIR}/proxy-server.conf
SWIFT_CONF=${SWIFT_CONFIG_DIR}/swift.conf
# Save current conf files for some reason...
[[ -r $SWIFT_CONFIG_PROXY_SERVER.$BASE_RELEASE ]] || cp -p $SWIFT_CONFIG_PROXY_SERVER $SWIFT_CONFIG_PROXY_SERVER.$BASE_RELEASE
[[ -r $SWIFT_CONF.$BASE_RELEASE ]] || cp -p $SWIFT_CONF $SWIFT_CONF.$BASE_RELEASE
# install_swift()
install_swift