Merge pull request #20 from gc-nathanh/bugfix/update-detection

Bugfix - grubcmdline reboot detection triggered by empty values in list
stackhpc · Feb 21, 2024 · 4c89301 · 4c89301
2 parents ccba8be + 98da7e2
commit 4c89301
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/roles/grubcmdline/tasks/main.yml b/roles/grubcmdline/tasks/main.yml
@@ -11,7 +11,7 @@
 - name: Notify reboot handler
   ansible.builtin.debug:
     msg: Old command line was {{ result.stdout }}
-  changed_when: old_cmdline != kernel_cmdline | sort | list
+  changed_when: old_cmdline != kernel_cmdline | select() | sort | list
   notify: "{{ kernel_restart_handler }}"
 
 - name: Slurp /etc/default/grub

diff --git a/roles/grubcmdline/vars/main.yml b/roles/grubcmdline/vars/main.yml
@@ -1,6 +1,6 @@
 ---
 # Should match on all of the the cmd line parameters
-kernel_cmdline_regex: "{{ '(' ~ kernel_cmdline | map('regex_escape') | list | join('|') ~ ')' }}" # noqa var-naming[no-role-prefix]
+kernel_cmdline_regex: "{{ '(' ~ kernel_cmdline | select() | map('regex_escape') | list | join('|') ~ ')' }}" # noqa var-naming[no-role-prefix]
 
 kernel_cmdline_sorted: "{{ kernel_cmdline | sort }}" # noqa var-naming[no-role-prefix]