commit 2a73a2b769f91dfa6322c24ac53fc7d0cbab65ef
author Jenkins <jenkins@review.openstack.org> Tue Jan 28 22:30:29 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 28 22:30:29 2014 +0000
tree 9f74d226474a26928201f38b99a29924ed59f2bd
parent ce31a49d89cf8c114b7c1414672d6646785ed886
parent daa9a734e2fe008a32ed0f98501e2ce2f80167c8

Merge "Repeatedly add log_filters,log_outputs to libvirtd.conf when restart"

lib/heat

diff --git a/lib/heat b/lib/heat
index 0307c64..b9b8aa6 100644
--- a/lib/heat
+++ b/lib/heat
@@ -60,13 +60,13 @@
     # remove old config files
     rm -f $HEAT_CONF_DIR/heat-*.conf
 
-    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST}
+    HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$HOST_IP}
     HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
     HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST}
     HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001}
-    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST}
+    HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$HOST_IP}
     HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003}
-    HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST}
+    HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
     HEAT_API_PORT=${HEAT_API_PORT:-8004}
     HEAT_API_PASTE_FILE=$HEAT_CONF_DIR/api-paste.ini
     HEAT_POLICY_FILE=$HEAT_CONF_DIR/policy.json

lib/swift

diff --git a/lib/swift b/lib/swift
index 44c230b..37b630c 100644
--- a/lib/swift
+++ b/lib/swift
@@ -652,8 +652,10 @@
     if type -p swift-init >/dev/null; then
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
     fi
-    # Dump the proxy server
-    sudo pkill -f swift-proxy-server
+    for type in proxy object container account; do
+        # Dump all of the servers
+        pkill -f swift-
+    done
 }
 
 # Restore xtrace