diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2016-12-20 11:17:45 +0800 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2016-12-20 11:17:45 +0800 |
| commit | 303361e1c69d5743ba621d37db1515297597f666 (patch) | |
| tree | d13593bc42e871b6215474546643b3b293720462 /tests/ci/clean_images.sh | |
| parent | 367691281be05a5f2c76455465ff14078415e6c2 (diff) | |
Replace heat, keystone and nova command with openstack command
JIRA: YARDSTICK-486
In future Openstack release, 'heat', 'keystone', 'nova' command will be
deprecated. So we need to use 'openstack' command instead.
Change-Id: I7070f8aaf0d235705b65e0760c845f843ad79719
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/clean_images.sh')
| -rwxr-xr-x | tests/ci/clean_images.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index b1942160b..5d661283d 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -15,15 +15,15 @@ cleanup() echo echo "========== Cleanup ==========" - if ! glance image-list; then + if ! openstack image list; then return fi - for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \ + for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \ -e yardstick-vivid-kernel | awk '{print $2}'); do echo "Deleting image $image..." - glance image-delete $image || true + openstack image delete $image || true done - nova flavor-delete yardstick-flavor &> /dev/null || true + openstack flavor delete yardstick-flavor &> /dev/null || true } |