Merge "kill throws an error while finding pid in quantum dhcp agent section"
diff --git a/exercises/volumes.sh b/exercises/volumes.sh
index 1c6320c..ffa12c4 100755
--- a/exercises/volumes.sh
+++ b/exercises/volumes.sh
@@ -158,8 +158,6 @@
start_time=`date +%s`
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep available; do sleep 1; done"; then
echo "Volume $VOL_NAME not created"
- end_time=`date +%s`
- echo "Failed volume-create after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@@ -176,8 +174,6 @@
die "Failure attaching volume $VOL_NAME to $NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep in-use; do sleep 1; done"; then
echo "Volume $VOL_NAME not attached to $NAME"
- end_time=`date +%s`
- echo "Failed volume-attach after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@@ -195,8 +191,6 @@
nova volume-detach $VM_UUID $VOL_ID || die "Failure detaching volume $VOL_NAME from $NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep available; do sleep 1; done"; then
echo "Volume $VOL_NAME not detached from $NAME"
- end_time=`date +%s`
- echo "Failed volume-detach after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@@ -207,8 +201,6 @@
nova volume-delete $VOL_ID || die "Failure deleting volume $VOL_NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME; do sleep 1; done"; then
echo "Volume $VOL_NAME not deleted"
- end_time=`date +%s`
- echo "Failed volume-delete after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
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:"