From: JingLu5 <lvjing5@huawei.com>
Date: Mon, 20 Mar 2017 02:32:51 +0000 (+0000)
Subject: update lxd image disk format for openstack CLI
X-Git-Tag: opnfv-5.0.RC1~536^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F30975%2F1;p=yardstick.git

update lxd image disk format for openstack CLI

JIRA: YARDSTICK-598

As we have replaced 'glance image-create' command with 'openstack image create'
command, we also need to update the disk-format for openstack CLI. the
'root-tar' is no longer a valid choice. (choose from 'ami', 'ari', 'aki',
'vhd', 'vmdk', 'raw', 'qcow2', 'vhdx', 'vdi', 'iso', 'ploop')

Change-Id: I53f839f658c5a6f216f5bb942b1c4f4dcdbf9814
Signed-off-by: JingLu5 <lvjing5@huawei.com>
---

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index b438e09e4..ee46962b5 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -116,7 +116,7 @@ load_yardstick_image()
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
         output=$(eval openstack image create \
             --public \
-            --disk-format root-tar \
+            --disk-format raw \
             --container-format bare \
             ${EXTRA_PARAMS} \
             --file ${RAW_IMAGE} \