New roles for better modularity

roles/nfs_server_define/tasks/main.yml

@@ -0,0 +1,15 @@
+---
+- name: Check connectivity to NFS servers
+  ansible.builtin.wait_for:
+    host: "{{ item }}"
+    port: 2049
+    timeout: 30
+  loop: "{{ nfs_np }}"
+  ignore_errors: true
+  register: active_nfs_servers
+
+- name: Define single NFS server
+  ansible.builtin.set_fact:
+    nfs_srv: "{{ active_nfs_servers | json_query(_nfs_query) | random }}"
+  vars:
+    _nfs_query: "results[?failed==`false`].item"

roles/nfs_server_define/vars/main.yml

@@ -0,0 +1,7 @@
+---
+nfs_np:
+  - 10.10.42.180
+  - 10.10.42.228
+
+nfs_prod:
+  - 10.10.42.180

roles/rear_backup/tasks/main.yml

@@ -1,24 +1,7 @@
 ---
-- name: Check for backup log presence
+- name: Check for previous backup and end host if present
-  ansible.builtin.stat:
+  ansible.builtin.include_role:
-    path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
+    name: rhc.rear.rear_backup_check
-  register: rear_backup_log_presence
-
-- name: End host if ReaR backup already exists
-  when:
-    - rear_backup_log_presence['stat']['exists'] | bool
-    - not rear_force_backup | default(false) | bool
-  block:
-    - name: Validate ReaR backup completion
-      ansible.builtin.command:
-        cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
-      register: validate_backup_log
-      failed_when: validate_backup_log['rc'] not in [0,1]
-
-    - name: End play if ReaR already exists
-      ansible.builtin.meta: end_host
-      when:
-        - validate_backup_log['rc'] == 0
 
 - name: Ensure nfs-utils and rear packages are present
   ansible.builtin.package:
@@ -27,28 +10,9 @@
       - rear
     state: present
 
-- name: Check connectivity to NFS servers
+- name: Check and define NFS server for backup
-  ansible.builtin.wait_for:
+  ansible.builtin.include_role:
-    host: "{{ item }}"
+    name: rhc.rear.nfs_server_define
-    port: 2049
-    timeout: 30
-  loop: "{{ nfs_np }}"
-  ignore_errors: true
-  register: active_nfs_servers
-
-- name: Define single NFS server
-  ansible.builtin.set_fact:
-    nfs_srv: "{{ active_nfs_servers | json_query(_nfs_query) | random }}"
-  vars:
-    _nfs_query: "results[?failed==`false`].item"
-
-- name: Create /etc/rear if it doesn't exist
-  ansible.builtin.file:
-    path: /etc/rear
-    state: directory
-    mode: "0755"
-    owner: root
-    group: root
 
 - name: Configure ReaR local.conf file
   ansible.builtin.include_role:

roles/rear_backup/vars/main.yml

@@ -1,11 +1,4 @@
 ---
-nfs_np:
-  - 10.10.42.180
-  - 10.10.42.228
-
-nfs_prod:
-  - 10.10.42.180
-
 rear_nfs_backup_share: /backups/standalone
 
 rear_grub_label: 'Relax-and-Recover *** RESTORES RHEL7 ***'

roles/rear_backup_check/tasks/main.yml

@@ -0,0 +1,21 @@
+---
+- name: Check for backup log presence
+  ansible.builtin.stat:
+    path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
+  register: rear_backup_log_presence
+
+- name: End host if ReaR backup already exists
+  when:
+    - rear_backup_log_presence['stat']['exists'] | bool
+    - not rear_force_backup | default(false) | bool
+  block:
+    - name: Validate ReaR backup completion
+      ansible.builtin.command:
+        cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
+      register: validate_backup_log
+      failed_when: validate_backup_log['rc'] not in [0,1]
+
+    - name: End play if ReaR already exists
+      ansible.builtin.meta: end_host
+      when:
+        - validate_backup_log['rc'] == 0

roles/rear_local_cfg/tasks/main.yml

@@ -1,4 +1,12 @@
 ---
+- name: Create /etc/rear if it doesn't exist
+  ansible.builtin.file:
+    path: /etc/rear
+    state: directory
+    mode: "0755"
+    owner: root
+    group: root
+
 - name: Configure ReaR local.conf file
   ansible.builtin.template:
     src: local.conf.j2