exit 0
fi
-# we only support k8s scenario deployment on openstack as of now
-if [[ "$DEPLOY_SCENARIO" != "k8-*" ]] && [[ "$PROVISIONER_TYPE" == "heat" ]]; then
+# do not delete the stack if not explicitly set to delete
+if [[ "$DELETE_STACK" != "yes" ]]; then
echo "-------------------------------------------------------------------------"
- echo "Info: Only k8s scenario deployment on OpenStack has been implemented!"
+ echo "Info: Stack will not be deleted upon the completion of the job!"
echo "-------------------------------------------------------------------------"
exit 0
fi
-if [[ "$DELETE_STACK" != "yes" ]]; then
+# k8s and onap scenario have stacks so exit for others
+if [[ ! "$DEPLOY_SCENARIO" =~ ^k8-.*|^onap-.* ]]; then
echo "-------------------------------------------------------------------------"
- echo "Info: Stack will not be deleted upon the completion of the job!"
+ echo "Info: Nothing to delete!"
echo "-------------------------------------------------------------------------"
exit 0
fi
source $WORKSPACE/.venv/bin/activate
set -u
pip install -q openstacksdk python-openstackclient python-heatclient
-echo "Info: Deleting stack $STACK_NAME"
+echo "Info: Deleting stack $STACK_NAME and keypair $KEYPAIR_NAME"
echo "-------------------------------------------------------------------------"
-source /tmp/openrc && sudo /bin/rm -f /tmp/openrc
+source /tmp/openrc && /bin/rm -f /tmp/openrc
openstack stack delete $STACK_NAME --wait --yes
+openstack keypair delete $KEYPAIR_NAME
echo "-------------------------------------------------------------------------"
-echo "Info: Stack $STACK_NAME has been deleted!"
+echo "Info: Stack $STACK_NAME and keypair $KEYPAIR_NAME have been deleted!"
# vim: set ts=2 sw=2 expandtab: