aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack/healthcheck/healthcheck.sh
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-12 08:45:23 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-12 08:45:23 +0000
commitf7359db4935314adff03cc2f5990a8eb4b00349a (patch)
treefdc4de66c1a6a9d99c00d8b2b335342d5c48bb46 /testcases/OpenStack/healthcheck/healthcheck.sh
parent9b65d329b6a4b47537ba8b13a777708b5caae7c6 (diff)
parent9df7f6fa368d673887c3d583320ca9a5a1458c3d (diff)
Merge "Improve LXD scenario support"
Diffstat (limited to 'testcases/OpenStack/healthcheck/healthcheck.sh')
-rwxr-xr-xtestcases/OpenStack/healthcheck/healthcheck.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 2449ac93..996aadcf 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -120,6 +120,7 @@ info "...Keystone OK!"
info "Testing Glance API..."
#################################
disk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_image 2> /dev/null || true)
+disk_format=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_format 2> /dev/null || true)
kernel_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.kernel_image 2> /dev/null || true)
ramdisk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.ramdisk_image 2> /dev/null || true)
extra_properties=$(cat ${YAML_FILE} | shyaml get-value healthcheck.extra_properties 2> /dev/null || true)
@@ -151,10 +152,10 @@ fi
debug "image extra_properties=${extra_properties}"
-eval glance image-create --name ${image_1} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_1} --disk-format ${disk_format} --container-format bare \
${extra_opts} < ${disk_img}
debug "image '${image_1}' created."
-eval glance image-create --name ${image_2} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_2} --disk-format ${disk_format} --container-format bare \
${extra_opts} < ${disk_img}
debug "image '${image_2}' created."
info "... Glance OK!"