From 9172e8483a7cc7e184fe0018006902560120843f Mon Sep 17 00:00:00 2001
From: Amol Kahat <amolkahat@gmail.com>
Date: Sun, 11 Jul 2021 12:05:00 -0400
Subject: [PATCH] Replace overcloud-delete.sh script with tripleo operator
 roles

This patch will remove all shell scripts and replace
them with tripleo operator ansible roles.

Change-Id: I1532f87a374631692a732999d3c3ed02fbcb9fef
Signed-off-by: Amol Kahat <amolkahat@gmail.com>
---
 roles/overcloud-delete/defaults/main.yml      |  1 -
 roles/overcloud-delete/tasks/main.yml         | 49 ++++++++++---------
 .../templates/overcloud_delete.sh.j2          | 18 -------
 3 files changed, 27 insertions(+), 41 deletions(-)
 delete mode 100644 roles/overcloud-delete/templates/overcloud_delete.sh.j2

diff --git a/roles/overcloud-delete/defaults/main.yml b/roles/overcloud-delete/defaults/main.yml
index 35b779997..ab193742a 100644
--- a/roles/overcloud-delete/defaults/main.yml
+++ b/roles/overcloud-delete/defaults/main.yml
@@ -1,7 +1,6 @@
 ---
 
 # Script and log locations used during the delete process.
-delete_script: overcloud_delete.sh.j2
 delete_log: "{{ working_dir }}/overcloud_delete.log"
 
 # 30 retries * 10 seconds delay = 5 minutes delete timeout
diff --git a/roles/overcloud-delete/tasks/main.yml b/roles/overcloud-delete/tasks/main.yml
index 3a541b46e..3c4295ad8 100644
--- a/roles/overcloud-delete/tasks/main.yml
+++ b/roles/overcloud-delete/tasks/main.yml
@@ -1,31 +1,36 @@
 ---
-# Generate a script from templates. These are scripts
-# rather than additional ansible tasks so that they can be run
-# manually from the undercloud host.
-- name: Create overcloud delete script
-  template:
-    src: "{{ delete_script }}"
-    dest: "{{ working_dir }}/overcloud-delete.sh"
-    mode: 0755
+- name: "Delete overcloud"
   tags:
-    - overcloud-scripts
-
-- when: step_delete_overcloud|bool
+    - overcloud-delete
   block:
-    - name: Delete the overcloud
-      shell: >
-        set -o pipefail &&
-        {{ working_dir }}/overcloud-delete.sh 2>&1 {{ timestamper_cmd }} > {{ delete_log }}
-      tags:
-        - overcloud-delete
+    - name: "Get overcloud id"
+      shell: >-
+        source {{ working_dir }}/stackrc && \
+        openstack stack list -f value -c ID
+      environment:
+        OVERCLOUD_NAME: "{{ stack_name }}"
+      register: overcloud_id
 
-    - name: check for delete command to complete or fail
+    - name: "Run overcloud delete"
+      when:
+        - step_delete_overcloud | bool
+      collections:
+        - tripleo.operator
+      include_role:
+        name: tripleo_overcloud_delete
+      vars:
+        tripleo_overcloud_delete_debug: true
+        tripleo_overcloud_delete_name: "{{ stack_name }}"
+        tripleo_overcloud_delete_rc_file: "{{ working_dir }}/stackrc"
+        tripleo_overcloud_delete_log: "{{ delete_log }}"
+
+    - name: "check for delete command to complete or fail"
+      when:
+        - step_delete_overcloud | bool
       shell: |
-          source {{ working_dir }}/stackrc
-          openstack stack show $(cat {{ working_dir }}/overcloud_id) -f yaml
+        source {{ working_dir }}/stackrc
+        openstack stack show {{ overcloud_id }} -f yaml
       delay: "{{ delete_check_delay }}"
       retries: "{{ delete_check_retries }}"
       until: heat_stack_show.stdout.find('DELETE_COMPLETE') != -1
       register: heat_stack_show
-      tags:
-        - overcloud-delete
diff --git a/roles/overcloud-delete/templates/overcloud_delete.sh.j2 b/roles/overcloud-delete/templates/overcloud_delete.sh.j2
deleted file mode 100644
index f3a64e452..000000000
--- a/roles/overcloud-delete/templates/overcloud_delete.sh.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-### --start_docs
-## Delete the overcloud deployment
-## ===============================
-
-## * Gather informations on the deployment
-## ::
-
-source {{ working_dir }}/stackrc
-OVERCLOUD_NAME="overcloud"
-OVERCLOUD_ID=$(openstack stack list -f value -c ID)
-echo $OVERCLOUD_ID > {{ working_dir }}/overcloud_id
-
-## * delete overcloud with confirmation
-## ::
-
-openstack stack delete --yes "$OVERCLOUD_NAME"
-
-### --stop_docs