communishift: seperate notifications from shutdown, added new playbook

Signed-off-by: David Kirwan <davidkirwanirl@gmail.com>

files/scripts/ansilog-playbook.py

@@ -77,6 +77,7 @@ _suffix_dns_replace = {}
 conf_play_remap = {
     'generate-updates-uptimes-per-host-file' : 'Updates+uptimes',
     'communishift_send_email_notifications' : 'CS_emails',
+    'communishift_disable_project' : 'CS_disable',
 }
 
 #  Dir. where we put, and look for, the files...

playbooks/manual/communishift_disable_project.yml

@@ -0,0 +1,26 @@
+---
+# Communishift project disable / shutdown path (inventory + per-project eligibility).
+# Uses communishift_projects and each entry's do_not_delete to skip exempt namespaces.
+# Currently logs intent; scale-to-zero in the role is still commented out.
+#
+# Run disable tasks only:
+#   ansible-playbook .../communishift_disable_project.yml --tags communishift_disable_project
+#
+- hosts: localhost
+  user: root
+  gather_facts: false
+
+  vars_files:
+    - /srv/web/infra/ansible/vars/global.yml
+    - "/srv/private/ansible/vars.yml"
+    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  tasks:
+    - name: Communishift project shutdown (eligible projects)
+      include_role:
+        name: communishift
+        tasks_from: cleanup-administration-shutdown-services
+        apply:
+          tags:
+            - communishift_disable_project
+      loop: "{{ lookup('dict', communishift_projects) }}"

playbooks/manual/communishift_send_email_notifications.yml

@@ -1,4 +1,10 @@
 ---
+# Sends Fedora Communishift lifecycle emails to project admins (FASJSON BCC).
+# Notifications only — see communishift_disable_project.yml for shutdown-related tasks.
+#
+# Run notifications only:
+#   ansible-playbook .../communishift_send_email_notifications.yml --tags communishift_send_notifications
+#
 - hosts: localhost
   user: root
   gather_facts: false
@@ -13,14 +19,15 @@
       include_role:
         name: communishift
         tasks_from: cleanup-administration-retrieve-data
-
-    - name: Communishift Cluster Cleanup Tasks
-      with_items: "{{ communishift_projects }}"
-      include_role:
-        name: communishift
-        tasks_from: cleanup-administration
         apply:
           tags:
-            - cleanup-administration-tasks
-      loop: "{{ lookup('dict', communishift_projects) }}"
+            - communishift_send_notifications
 
+    - name: Communishift send tenant notification emails
+      include_role:
+        name: communishift
+        tasks_from: cleanup-administration-send-notifications
+        apply:
+          tags:
+            - communishift_send_notifications
+      loop: "{{ lookup('dict', communishift_projects) }}"

roles/communishift/tasks/cleanup-administration-send-notifications.yml

@@ -12,7 +12,7 @@
       Dear Fedora Communishift Project Administrators (BCC'd),
 
 
-      This is a reminder that the Communishift project {{ item.value.name }} will be disasbled and then later deleted during the Fedora post
+      This is a reminder that the Communishift project {{ item.value.name }} will be disabled and then later deleted during the Fedora post
       release process at the same time the oldest fedora is retired (1 month after a new fedora release).
 
       Please ensure you have a backup of any important configuration or data from your project. Consult Openshift docs.

roles/communishift/tasks/cleanup-administration.yml

@@ -1,3 +0,0 @@
----
-- include_tasks: cleanup-administration-send-notifications.yml
-- include_tasks: cleanup-administration-shutdown-services.yml