From 7bd25c06eaa007fbb32a81412ce38c67aa35340e Mon Sep 17 00:00:00 2001
From: Rajeshwari Dharwadkar <rdharwadkar@suse.com>
Date: Tue, 4 Jun 2019 20:45:53 -0700
Subject: [PATCH] remove DELETE_ANYWAY=YES requirement for remove deployment.

We already have warning and user input to continue in run.sh
---
 run.sh                                   | 2 +-
 script_library/deployment-actions-kvm.sh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/run.sh b/run.sh
index 4fc9505f5..7ceb82382 100755
--- a/run.sh
+++ b/run.sh
@@ -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
diff --git a/script_library/deployment-actions-kvm.sh b/script_library/deployment-actions-kvm.sh
index 5ed6009fb..fb5f0115f 100755
--- a/script_library/deployment-actions-kvm.sh
+++ b/script_library/deployment-actions-kvm.sh
@@ -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"