From 1355dc96f78a54d478163868bba7458b43c4515a Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Thu, 27 Feb 2025 19:38:35 -0500 Subject: [PATCH] Minor updates --- playbooks/rear_backup.yml | 6 ------ playbooks/rear_backup_validate.yml | 9 +++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/playbooks/rear_backup.yml b/playbooks/rear_backup.yml index e11ad37..ea41218 100644 --- a/playbooks/rear_backup.yml +++ b/playbooks/rear_backup.yml @@ -7,12 +7,6 @@ tasks: - - name: "Debug survey: rear_force_backup" - ansible.builtin.debug: - var: rear_force_backup - when: - - rear_force_backup is defined - - name: Include the backup role ansible.builtin.include_role: name: ../roles/rear_backup diff --git a/playbooks/rear_backup_validate.yml b/playbooks/rear_backup_validate.yml index 37e1efe..a1f15ea 100644 --- a/playbooks/rear_backup_validate.yml +++ b/playbooks/rear_backup_validate.yml @@ -6,8 +6,7 @@ strategy: free vars: - rear_backup_success_path: "/var/log/IPE/IPU" - rear_backup_success_file: "{{ rear_backup_success_path }}/bigboot_success" + rear_backup_success_file: "/var/log/IPE/IPU/bigboot_rear_success" tasks: - name: Check for backup log presence @@ -23,6 +22,7 @@ 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: Debug validate_backup_log @@ -39,13 +39,10 @@ - name: Create Bigboot backup success file ansible.builtin.copy: dest: "{{ rear_backup_success_file }}" - content: "success" + 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." - - name: OS Failure - ansible.builtin.debug: - msg: "OS failure: Expecting version {{ ansible_distribution_major_version }}, got {{ ansible_distribution_major_version | int + 1 }}"