diff options
| author |   boucherv <valentin.boucher@orange.com> | 2016-08-12 10:38:16 +0200 |
|---|---|---|
| committer | boucherv <valentin.boucher@orange.com> | 2016-08-12 10:38:16 +0200 |
| commit | 9df7f6fa368d673887c3d583320ca9a5a1458c3d (patch) | |
| tree | 44077a4bc4233881ff44874be7b760af16cdc067 /testcases/OpenStack | |
| parent | 7eefbe8f7ec52d727e8e504e4ddd4ddb57cf569e (diff) | |
Improve LXD scenario support
JIRA: FUNCTEST-268
Change-Id: I8c8a3eff4a7e94b963c0307010a60723dc13a537
Signed-off-by: boucherv <valentin.boucher@orange.com>
Diffstat (limited to 'testcases/OpenStack')
| -rwxr-xr-x | testcases/OpenStack/healthcheck/healthcheck.sh | 5 |
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!" |