From b9fcf5442f876edb401dda8ce98735b8e89c27cf Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 20 Feb 2013 14:05:49 -0600
Subject: [PATCH] Swift updates:

* Shut down swift in stop-base
* Save base swift config files
---
 stop-base     | 5 +++++
 upgrade-swift | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/stop-base b/stop-base
index 3a0e26a2..3bfbd0fc 100755
--- a/stop-base
+++ b/stop-base
@@ -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
diff --git a/upgrade-swift b/upgrade-swift
index ca30f2a2..add9ccb9 100755
--- a/upgrade-swift
+++ b/upgrade-swift
@@ -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