Merge "Configure and launch Heat REST API."
diff --git a/files/apts/quantum b/files/apts/quantum
index 568438f..ed3887b 100644
--- a/files/apts/quantum
+++ b/files/apts/quantum
@@ -1,5 +1,5 @@
iptables
-mysql #NOPRIME
+mysql-server #NOPRIME
sudo
python-paste
python-routes
diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 2df0315..1e35036 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -201,6 +201,10 @@
# Volume API test configuration
VOLUME_CATALOG_TYPE=volume
+# Live migration
+LIVE_MIGRATION_AVAILABLE=${LIVE_MIGRATION_AVAILABLE:-False}
+USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
+
sed -e "
s,%IDENTITY_USE_SSL%,$IDENTITY_USE_SSL,g;
s,%IDENTITY_HOST%,$IDENTITY_HOST,g;
@@ -256,6 +260,8 @@
s,%VOLUME_CATALOG_TYPE%,$VOLUME_CATALOG_TYPE,g;
s,%VOLUME_BUILD_INTERVAL%,$VOLUME_BUILD_INTERVAL,g;
s,%VOLUME_BUILD_TIMEOUT%,$VOLUME_BUILD_TIMEOUT,g;
+ s,%LIVE_MIGRATION_AVAILABLE%,$LIVE_MIGRATION_AVAILABLE,g;
+ s,%USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION%,$USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION,g;
" -i $TEMPEST_CONF
echo "Created tempest configuration file:"
diff --git a/unstack.sh b/unstack.sh
index 1bace15..49f1e8b 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -110,5 +110,6 @@
# Quantum dhcp agent runs dnsmasq
if is_service_enabled q-dhcp; then
- sudo kill -9 $(ps aux | awk '/[d]nsmasq.+interface=tap/ { print $2 }')
+ pid=$(ps aux | awk '/[d]nsmasq.+interface=tap/ { print $2 }')
+ [ ! -z $pid ] && sudo kill -9 $pid
fi