echo
echo "========== Cleanup =========="
- if ! glance image-list; then
+ if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then
+ SECURE="--insecure"
+ else
+ SECURE=""
+ fi
+
+ if ! openstack ${SECURE} image list; then
return
fi
- for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
- -e yardstick-vivid-kernel | awk '{print $2}'); do
+ for image in $(openstack ${SECURE} image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
+ | awk '{print $2}'); do
echo "Deleting image $image..."
- glance image-delete $image || true
+ openstack ${SECURE} image delete $image || true
done
- nova flavor-delete yardstick-flavor &> /dev/null || true
+ openstack ${SECURE} flavor delete yardstick-flavor &> /dev/null || true
+ openstack ${SECURE} flavor delete storperf &> /dev/null || true
+}
+
+main()
+{
+ cleanup
}
+
+main