From 10e395ba6690f31a82dc13b6af5124229690c70e Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 26 Oct 2023 16:02:28 +0300
Subject: [PATCH] Ansible: Some update fixes.

---
 Ansible/roles/router/tasks/main.yaml | 2 +-
 Ansible/update.yaml                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ansible/roles/router/tasks/main.yaml b/Ansible/roles/router/tasks/main.yaml
index 5feb041..a0f292c 100644
--- a/Ansible/roles/router/tasks/main.yaml
+++ b/Ansible/roles/router/tasks/main.yaml
@@ -509,7 +509,7 @@
       VERBOSESTATUS=0
       syspatch -c
       pkg_add -uInx | grep -v '^quirks'
-      fw_update -an | grep -v '^fw_update: added none; updated none;'
+      fw_update -an | grep -v '^fw_update: add none; update none;'
       {{ "rcctl ls rogue" if ansible_distribution_version is version('7.1', '>=') }}
     # yamllint enable rule:line-length
     dest: /etc/daily.local
diff --git a/Ansible/update.yaml b/Ansible/update.yaml
index b6eb489..4ca5214 100644
--- a/Ansible/update.yaml
+++ b/Ansible/update.yaml
@@ -27,9 +27,9 @@
         - name: Update firmware
           command: fwupdmgr --assume-yes update
           register: fwupdmgr
-          changed_when: fwupdmgr.stdout_lines|length > 0
+          changed_when: fwupdmgr.rc == 0
           # yamllint disable rule:line-length
-          failed_when: fwupdmgr.rc not in [0, 2] and "No updatable devices" not in fwupdmgr.stderr_lines
+          failed_when: fwupdmgr.rc not in [0, 2]
 
         - name: Gather package facts
           package_facts:
@@ -109,7 +109,7 @@
           command: fw_update -a
           register: fw_update
           changed_when: |-
-            "fw_update: added none; updated none;" not in fw_update.stdout
+            "fw_update: add none; update none;" not in fw_update.stdout
 
         - name: Set reboot needed fact
           set_fact:
-- 
GitLab