From 26638d9728b597cf7edce860dc4224287dfb05d2 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Wed, 5 Mar 2025 22:47:50 -0500
Subject: [PATCH] Tweaks

---
 playbooks/nfs_export.yml                     |  3 ++-
 playbooks/rear_backup.yml                    | 20 ++++++++++++++++----
 playbooks/rear_vars.yml                      |  6 +++---
 roles/nfs_server_define/tasks/main.yml       |  6 +++++-
 roles/rear_backup/tasks/main.yml             |  8 ++++----
 roles/rear_local_cfg/templates/local.conf.j2 |  2 +-
 roles/rear_vars/defaults/main.yml            |  2 +-
 7 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/playbooks/nfs_export.yml b/playbooks/nfs_export.yml
index 005050f..05649a3 100644
--- a/playbooks/nfs_export.yml
+++ b/playbooks/nfs_export.yml
@@ -29,9 +29,10 @@
   tasks:
     - name: Grab the template name
       ansible.builtin.set_stats:
+        aggregate: false
+        per_host: false
         data:
           nfs_exports_template_name: "{{ tower_job_template_name | default('NA') }}"
-        aggregate: true
 
     - name: Create IP list and add to NFS exports
       when: not rear_backup_skip | default(false) | bool
diff --git a/playbooks/rear_backup.yml b/playbooks/rear_backup.yml
index ee30190..0da7c34 100644
--- a/playbooks/rear_backup.yml
+++ b/playbooks/rear_backup.yml
@@ -6,15 +6,27 @@
   strategy: free
 
   tasks:
-    - name: Import rear_vars role
-      ansible.builtin.import_role:
-        name: rhc.rear.rear_vars
-
     - name: Perform ReaR Backup
       when:
         - ansible_distribution_major_version >= '7'
         - not rear_backup_skip | default(false) | bool
       block:
+        - name: Import rear_vars role
+          ansible.builtin.import_role:
+            name: rhc.rear.rear_vars
+
+        - name: Fetch the template name from NFS exports
+          ansible.builtin.set_fact:
+            job_template_name: "{{ nfs_exports_template_name }}"
+
         - name: Include the backup role
           ansible.builtin.include_role:
             name: rhc.rear.rear_backup
+      rescue:
+        - name: Clean up on ReaR failure
+          ansible.builtin.include_role:
+            name: rhc.rear.rear_remove
+
+        - name: Fail and print message
+          ansible.builtin.fail:
+            msg: "ReaR backup failed. All changes have been rolled back. Please retry."
diff --git a/playbooks/rear_vars.yml b/playbooks/rear_vars.yml
index b8fca3c..d16f703 100644
--- a/playbooks/rear_vars.yml
+++ b/playbooks/rear_vars.yml
@@ -6,13 +6,13 @@
   strategy: free
 
   tasks:
-    - name: Include rear_vars
+    - name: Import rear_vars role
       ansible.builtin.import_role:
-        name: ../roles/rear_vars
+        name: rhc.rear.rear_vars
 
     - name: Debug rear_vars_nfs_share
       ansible.builtin.debug:
-        msg: "{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }} ({{ rear_vars_nfs_share[rear_backup_workflow] }})"
+        msg: "{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }} ({{ rear_vars_nfs_fsid[rear_backup_workflow] }})"
 
     - name: Debug rear_vars_grub_label
       ansible.builtin.debug:
diff --git a/roles/nfs_server_define/tasks/main.yml b/roles/nfs_server_define/tasks/main.yml
index 5e4cac8..b52a22c 100644
--- a/roles/nfs_server_define/tasks/main.yml
+++ b/roles/nfs_server_define/tasks/main.yml
@@ -1,9 +1,13 @@
 ---
+- name: Debug job_template_name
+  ansible.builtin.debug:
+    msg: "We'd pick Non-Prod/Prod NFS servers from here based on the selected job template name: {{ job_template_name }}."
+
 - name: Check connectivity to NFS servers
   ansible.builtin.wait_for:
     host: "{{ item }}"
     port: 2049
-    timeout: 30
+    timeout: 5 # default: 30
   loop: "{{ rear_vars_nfs_np }}"
   ignore_errors: true
   register: active_nfs_servers
diff --git a/roles/rear_backup/tasks/main.yml b/roles/rear_backup/tasks/main.yml
index 398bb59..cabe000 100644
--- a/roles/rear_backup/tasks/main.yml
+++ b/roles/rear_backup/tasks/main.yml
@@ -40,10 +40,6 @@
     - name: Write backup success file
       ansible.builtin.include_tasks:
         file: create_success_file.yml
-
-    - name: ReaR backup success
-      ansible.builtin.debug:
-        msg: "ReaR backup has completed successfully."
   rescue:
     - name: ReaR backup failed
       ansible.builtin.fail:
@@ -63,3 +59,7 @@
     mode: "0600"
   when:
     - rear_config_stat['stat']['exists'] | bool
+
+- name: ReaR backup success
+  ansible.builtin.debug:
+    msg: "ReaR backup has completed successfully."
diff --git a/roles/rear_local_cfg/templates/local.conf.j2 b/roles/rear_local_cfg/templates/local.conf.j2
index 52c514d..e2112b9 100644
--- a/roles/rear_local_cfg/templates/local.conf.j2
+++ b/roles/rear_local_cfg/templates/local.conf.j2
@@ -6,7 +6,7 @@ OUTPUT=ISO
 OUTPUT_URL=nfs://{{ nfs_srv }}{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }}
 BACKUP=NETFS
 BACKUP_URL=nfs://{{ nfs_srv }}{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }}
-# SSH_ROOT_PASSWORD="bob"
+# SSH_ROOT_PASSWORD="foo"
 USE_STATIC_NETWORKING=yes
 CLONES_ALL_USERS_GROUPS=yes
 SSH_FILES=yes
diff --git a/roles/rear_vars/defaults/main.yml b/roles/rear_vars/defaults/main.yml
index b7f8b4d..c497d0f 100644
--- a/roles/rear_vars/defaults/main.yml
+++ b/roles/rear_vars/defaults/main.yml
@@ -8,7 +8,7 @@ rear_backup_workflow: standalone
 
 # Used by:
 #   - rear_restore
-rear_restore_tmpdir: /tmp/rear_restore
+rear_restore_tmpdir: /var/tmp/rear_restore
 
 # Used by:
 #   - rear_backup