Skip to content
This repository has been archived by the owner on Nov 11, 2019. It is now read-only.

Commit

Permalink
remove DELETE_ANYWAY=YES requirement for remove deployment.
Browse files Browse the repository at this point in the history
We already have warning and user input to continue in run.sh
  • Loading branch information
Rajeshwari Dharwadkar committed Jun 5, 2019
1 parent ad7ec70 commit 7bd25c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ case "$deployment_action" in
clean_airship clean_openstack_clean_ucp_clean_rest
;;
"remove_deployment")
read -r -p "WARNING: Please remove all VM(s) from all compute host(s). Are you sure to continue? [y/n] " user_input
read -r -p "WARNING: Please remove all VM(s) from all compute host(s). This deletes everything that is deployed. Are you sure to continue? [y/n] " user_input
if [[ $user_input == "y" ]]; then
clean_airship
else
Expand Down
6 changes: 2 additions & 4 deletions script_library/deployment-actions-kvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ function clean_airship(){
clean_action=" -e clean_action=$1"
action_desc=$1
fi
echo "DANGER ZONE. Set the env var 'DELETE_ANYWAY' to 'YES' to delete airship artifacts ( ${action_desc} ) in your userspace."
if [[ ${DELETE_ANYWAY:-"NO"} == "YES" ]]; then
run_ansible ${socok8s_absolute_dir}/playbooks/generic-clean_airship.yml ${clean_action}
fi
echo "Warning: This will delete all airship artifacts ( ${action_desc} ) in your userspace."
run_ansible ${socok8s_absolute_dir}/playbooks/generic-clean_airship.yml ${clean_action}
}
function clean_kvm(){
echo "Not implemented"
Expand Down

0 comments on commit 7bd25c0

Please sign in to comment.