From 25e7b03befbb47ac29f59b5fbd3fee12a18a613e Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Thu, 6 Mar 2025 00:01:17 -0500 Subject: [PATCH] Cleanup --- playbooks/gather_ipv4.yml | 1 - playbooks/nfs_export.yml | 5 +-- playbooks/rear_backup.yml | 4 +- playbooks/rear_backup_validate.yml | 61 -------------------------- playbooks/rear_remove.yml | 2 +- playbooks/rear_vars.yml | 19 -------- roles/nfs_export/tasks/main.yml | 26 ++++------- roles/rear_backup_check/tasks/main.yml | 2 +- roles/rear_vars/defaults/main.yml | 3 ++ 9 files changed, 18 insertions(+), 105 deletions(-) delete mode 100644 playbooks/rear_backup_validate.yml delete mode 100644 playbooks/rear_vars.yml diff --git a/playbooks/gather_ipv4.yml b/playbooks/gather_ipv4.yml index 6570298..22b4aa3 100644 --- a/playbooks/gather_ipv4.yml +++ b/playbooks/gather_ipv4.yml @@ -9,5 +9,4 @@ ansible.builtin.set_stats: data: ip_addresses: "{{ ansible_all_ipv4_addresses }}" - server_hostname: "{{ ansible_hostname }}" aggregate: true diff --git a/playbooks/nfs_export.yml b/playbooks/nfs_export.yml index 05649a3..5d445df 100644 --- a/playbooks/nfs_export.yml +++ b/playbooks/nfs_export.yml @@ -27,7 +27,7 @@ gather_facts: true tasks: - - name: Grab the template name + - name: Capture the job template name ansible.builtin.set_stats: aggregate: false per_host: false @@ -37,10 +37,9 @@ - name: Create IP list and add to NFS exports when: not rear_backup_skip | default(false) | bool block: - - name: Create list with IP addresses and hostnames + - name: Create list with IP addresses ansible.builtin.set_fact: client_ips: "{{ ip_addresses | list | flatten }}" - namehost: "{{ server_hostname }}" - name: Import rear_vars role ansible.builtin.import_role: diff --git a/playbooks/rear_backup.yml b/playbooks/rear_backup.yml index 0da7c34..24ce398 100644 --- a/playbooks/rear_backup.yml +++ b/playbooks/rear_backup.yml @@ -8,14 +8,14 @@ tasks: - name: Perform ReaR Backup when: - - ansible_distribution_major_version >= '7' + - 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 + - name: Fetch the NFS exports template name ansible.builtin.set_fact: job_template_name: "{{ nfs_exports_template_name }}" diff --git a/playbooks/rear_backup_validate.yml b/playbooks/rear_backup_validate.yml deleted file mode 100644 index 83b5d97..0000000 --- a/playbooks/rear_backup_validate.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -- name: ReaR Backup Validation - hosts: all - become: true - gather_facts: true - strategy: free - - vars: - rear_backup_success_file: "/var/log/IPE/IPU/el7to8/bigboot_rear_success" - - tasks: - - name: Check for backup log presence - ansible.builtin.stat: - path: "/var/log/rear/rear-{{ ansible_hostname }}.log" - register: rear_backup_log_presence - - - name: ReaR Backup Validation - when: - - rear_backup_log_presence['stat']['exists'] | bool - block: - # - name: Validate ReaR backup completion - # ansible.builtin.command: - # cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log" - # changed_when: false - # ignore_errors: true - # register: validate_backup_log - - - 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: Debug validate_backup_log - ansible.builtin.debug: - var: validate_backup_log - when: - - validate_backup_log['rc'] == 0 - - - name: Debug validate_backup_log - ansible.builtin.debug: - msg: "p00p" - when: - - validate_backup_log['rc'] == 1 - - # - name: Create log file directory if not present - # ansible.builtin.file: - # path: "{{ rear_backup_success_path }}" - # state: directory - # mode: "0755" - - # - name: Create Bigboot backup success file - # ansible.builtin.copy: - # dest: "{{ rear_backup_success_file }}" - # content: "success\n" - # mode: "0644" - rescue: - - name: No backup log found - ansible.builtin.debug: - msg: "ReaR backup log could not be found or an error was encountered. Please run the backup and try again." - diff --git a/playbooks/rear_remove.yml b/playbooks/rear_remove.yml index 40f0d82..887c69e 100644 --- a/playbooks/rear_remove.yml +++ b/playbooks/rear_remove.yml @@ -7,4 +7,4 @@ tasks: - name: Run cleanup directly ansible.builtin.include_role: - name: ../roles/rear_remove + name: rhc.rear.rear_remove diff --git a/playbooks/rear_vars.yml b/playbooks/rear_vars.yml deleted file mode 100644 index d16f703..0000000 --- a/playbooks/rear_vars.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: Expose ReaR variables - hosts: all - become: true - gather_facts: true - strategy: free - - tasks: - - name: Import rear_vars role - ansible.builtin.import_role: - 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_fsid[rear_backup_workflow] }})" - - - name: Debug rear_vars_grub_label - ansible.builtin.debug: - var: rear_vars_grub_label diff --git a/roles/nfs_export/tasks/main.yml b/roles/nfs_export/tasks/main.yml index 4a2ef44..926f40d 100644 --- a/roles/nfs_export/tasks/main.yml +++ b/roles/nfs_export/tasks/main.yml @@ -1,17 +1,5 @@ --- -- name: Ensure share directory exists - ansible.builtin.file: - path: "{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }}" - state: directory - mode: "0777" - owner: root - group: root - -# We should use Ansible to determine disk space, not command/shell: -# - name: Debug mounts -# ansible.builtin.debug: -# var: ansible_facts['mounts'] - +# We should use Ansible to determine disk space, not command/shell (refactor): - name: Check disk space on ReaR Backup filesystem for NFS servers ansible.builtin.shell: | set -o pipefail @@ -19,10 +7,6 @@ register: disk_space changed_when: false -# - name: Debug disk_space -# ansible.builtin.debug: -# var: disk_space - - name: Fail job if less than 50GB space ansible.builtin.fail: msg: ReaR NFS server {{ inventory_hostname }} has less than 50GB of space on filesystem." @@ -34,6 +18,14 @@ when: - client_ips is not defined +- name: Ensure share directory exists + ansible.builtin.file: + path: "{{ rear_vars_nfs_base }}/{{ rear_backup_workflow }}" + state: directory + mode: "0777" + owner: root + group: root + - name: Add remote hosts to /etc/exports ansible.builtin.lineinfile: path: /etc/exports diff --git a/roles/rear_backup_check/tasks/main.yml b/roles/rear_backup_check/tasks/main.yml index f7b8ea3..546394e 100644 --- a/roles/rear_backup_check/tasks/main.yml +++ b/roles/rear_backup_check/tasks/main.yml @@ -4,7 +4,7 @@ path: "{{ rear_backup_success_file_path }}/{{ rear_backup_workflow }}_rear_success" register: rear_backup_success_file -- name: End if backup has already completed successfully +- name: End host if backup has already completed successfully ansible.builtin.meta: end_host when: - rear_backup_success_file['stat']['exists'] | bool diff --git a/roles/rear_vars/defaults/main.yml b/roles/rear_vars/defaults/main.yml index c497d0f..5a30b35 100644 --- a/roles/rear_vars/defaults/main.yml +++ b/roles/rear_vars/defaults/main.yml @@ -6,10 +6,12 @@ # - rear_restore rear_backup_workflow: standalone + # Used by: # - rear_restore rear_restore_tmpdir: /var/tmp/rear_restore + # Used by: # - rear_backup rear_backup_success_file_path: "/var/IPE/IPU/el7to8" @@ -17,6 +19,7 @@ rear_backup_success_file_path: "/var/IPE/IPU/el7to8" rear_vars_grub_label: 'Relax-and-Recover *** RESTORES RHEL7 ***' rear_vars_grub_conf: /etc/grub.d/45_rear + # Used by: # - nfs_export # - rear_backup