JIRA: BOTTLENECK-35
Change-Id: I157ba0f81c51320979094c6e6a3528b69e54b07c
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
- echo "clean up bottlenecks images"
+ echo "clean up bottlenecks images and keys"
- if ! glance image-list; then
- return
+ if glance image-list; then
+ for image in $(glance image-list | grep -e $IMAGE_NAME | awk '{print $2}'); do
+ echo "clean up image $image"
+ glance image-delete $image || true
+ done
- #need to check
- for image in $(glance image-list | grep -e $IMAGE_NAME | awk '{print $2}'); do
- echo "clean up image $image"
- glance image-delete $iamge || true
- done
+ if nova keypair-list; then
+ for key in $(nova keypair-list | grep -e $KEY_NAME | awk '{print $2}'); do
+ echo "clean up key $key"
+ nova keypair-delete || true
+ done
+ fi
}
bottlenecks_build_image()
}
bottlenecks_build_image()
#IMAGE_FILE_NAME=""
bottlenecks_env_prepare
#IMAGE_FILE_NAME=""
bottlenecks_env_prepare
#bottlenecks_build_image
bottlenecks_load_cirros_image
bottlenecks_create_instance
#bottlenecks_build_image
bottlenecks_load_cirros_image
bottlenecks_create_instance