From b120b8aebaeebe575d7a6b21d8ffd1b8ec6cbaac Mon Sep 17 00:00:00 2001
From: Michael Collins <gomatrixhosting@tutanota.com>
Date: Tue, 24 Aug 2021 14:27:50 +0800
Subject: [PATCH] delay these till the next playbook

---
 roles/matrix-awx/tasks/abort_deletion.yml     | 12 ----------
 .../matrix-awx/tasks/delete_awx_templates.yml | 24 -------------------
 2 files changed, 36 deletions(-)

diff --git a/roles/matrix-awx/tasks/abort_deletion.yml b/roles/matrix-awx/tasks/abort_deletion.yml
index f3220b6ac..30ced6d1e 100644
--- a/roles/matrix-awx/tasks/abort_deletion.yml
+++ b/roles/matrix-awx/tasks/abort_deletion.yml
@@ -1,12 +1,4 @@
 
-# abort deletion
-
-- name: Include hosting vars
-  include_vars:
-    file: /var/lib/awx/projects/hosting/hosting_vars.yml
-  when: cancel_deletion|bool
-  no_log: True
-
 - name: Install jq in AWX
   delegate_to: 127.0.0.1
   yum:
@@ -33,8 +25,6 @@
     validate_certs: yes
   when: cancel_deletion|bool
 
-# restore use of templates
-
 - name: Grant execute permission on 'Deploy/Update a Server' job template
   delegate_to: 127.0.0.1
   awx.awx.tower_role:
@@ -239,8 +229,6 @@
     validate_certs: yes
   when: (matrix_domain is defined) and (cancel_deletion|bool)
 
-# trigger cleanup
-
 - name: Save new 'Delete Job Template' survey.json to the AWX tower, template
   delegate_to: 127.0.0.1
   template:
diff --git a/roles/matrix-awx/tasks/delete_awx_templates.yml b/roles/matrix-awx/tasks/delete_awx_templates.yml
index 17e097918..3aa839cd2 100755
--- a/roles/matrix-awx/tasks/delete_awx_templates.yml
+++ b/roles/matrix-awx/tasks/delete_awx_templates.yml
@@ -293,27 +293,3 @@
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
   when: matrix_domain is defined
-
-- name: Remove Matrix server from organisations inventory
-  delegate_to: 127.0.0.1
-  awx.awx.tower_host:
-    name: "matrix.{{ matrix_domain }}"
-    description: "{{ matrix_domain }} Matrix Server"
-    inventory: "{{ member_id }}"
-    state: absent
-    tower_host: "https://{{ tower_host }}"
-    tower_oauthtoken: "{{ tower_token.stdout }}"
-    validate_certs: yes
-  when: matrix_domain is defined
-  
-- name: Remove Wireguard Server from organisations inventory
-  delegate_to: 127.0.0.1
-  awx.awx.tower_host:
-    name: "wireguard.{{ matrix_domain }}"
-    description: "{{ matrix_domain }} Wireguard Proxy"
-    inventory: "{{ member_id }}"
-    state: absent
-    tower_host: "https://{{ tower_host }}"
-    tower_oauthtoken: "{{ tower_token.stdout }}"
-    validate_certs: yes
-  when: matrix_domain is defined