commit 68e4bfee664cd3dbd027c7dd00500affecc90b4e
author Jenkins <jenkins@review.openstack.org> Tue Jan 28 22:30:31 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 28 22:30:31 2014 +0000
tree c644ae095ba7026af14efa1572e947c5627c07dc
parent 2a73a2b769f91dfa6322c24ac53fc7d0cbab65ef
parent fc744f9713fcccfebeb52e35c7fc1ce955b89200

Merge "Convert trove to plugin"

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/nova

diff --git a/lib/nova b/lib/nova
index b85f094..dbaa3f5 100644
--- a/lib/nova
+++ b/lib/nova
@@ -652,8 +652,12 @@
         local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"
         local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
         # Enable server side traces for libvirtd
-        echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
-        echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+        if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
+            echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+        fi
+        if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
+            echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+        fi
 
         # The group **$LIBVIRT_GROUP** is added to the current user in this script.
         # Use 'sg' to execute nova-compute as a member of the **$LIBVIRT_GROUP** group.

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