commit fe2f9868164d169c4170cc41285247dd20a39092
author Jenkins <jenkins@review.openstack.org> Wed Dec 24 18:20:56 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Dec 24 18:20:57 2014 +0000
tree 5da9fe1f199e52b70b7d4a3ee0a1634a08c806ac
parent 17061f9c3cd2b64f62529c6d148144eb42427b78
parent f3e75bf979bac5330034d350c416c61df7d8feb4

Merge "Fixes Heat tempest issue due to hardcoded qcow2 extension"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 6fc157f..7cac6dd 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -372,7 +372,7 @@
     # Orchestration Tests
     if is_service_enabled heat; then
         if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
-            iniset $TEMPEST_CONFIG orchestration image_ref $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2")
+            iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")
         fi
         # build a specialized heat flavor
         available_flavors=$(nova flavor-list)