From dddea19c92b16075aefd78c3b553a52009cb8f72 Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Wed, 27 Mar 2019 10:55:13 +0200
Subject: [PATCH] Remove deprecated commands from overcloud deletion

Update overcloud delete role with new commands.

Change-Id: I0b66d3ed3371e33ffbbbb1248f9009ac11a4589a
---
 roles/overcloud-delete/tasks/main.yml                  |  2 +-
 .../overcloud-delete/templates/overcloud_delete.sh.j2  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/roles/overcloud-delete/tasks/main.yml b/roles/overcloud-delete/tasks/main.yml
index da19adc47..3a541b46e 100644
--- a/roles/overcloud-delete/tasks/main.yml
+++ b/roles/overcloud-delete/tasks/main.yml
@@ -22,7 +22,7 @@
     - name: check for delete command to complete or fail
       shell: |
           source {{ working_dir }}/stackrc
-          heat stack-show $(cat {{ working_dir }}/overcloud_id)
+          openstack stack show $(cat {{ working_dir }}/overcloud_id) -f yaml
       delay: "{{ delete_check_delay }}"
       retries: "{{ delete_check_retries }}"
       until: heat_stack_show.stdout.find('DELETE_COMPLETE') != -1
diff --git a/roles/overcloud-delete/templates/overcloud_delete.sh.j2 b/roles/overcloud-delete/templates/overcloud_delete.sh.j2
index 012f010ed..f3a64e452 100644
--- a/roles/overcloud-delete/templates/overcloud_delete.sh.j2
+++ b/roles/overcloud-delete/templates/overcloud_delete.sh.j2
@@ -7,16 +7,12 @@
 
 source {{ working_dir }}/stackrc
 OVERCLOUD_NAME="overcloud"
-OVERCLOUD_ID=$(openstack stack list | grep "$OVERCLOUD_NAME" | awk '{print $2}')
+OVERCLOUD_ID=$(openstack stack list -f value -c ID)
 echo $OVERCLOUD_ID > {{ working_dir }}/overcloud_id
 
-## * select the correct command for the deletion
+## * delete overcloud with confirmation
 ## ::
 
-if heat stack-delete --help | grep -q "\-\-yes"; then
-    heat stack-delete --yes "$OVERCLOUD_NAME"
-else
-    heat stack-delete "$OVERCLOUD_NAME"
-fi
+openstack stack delete --yes "$OVERCLOUD_NAME"
 
 ### --stop_docs