Merge pull request #2455 from stackhpc/reset-bls-entries-hook

Add hook to reset-bls-entries after host package update

Author: mnasiadka

etc/kayobe/ansible/maintenance/reset-bls-entries.yml

@@ -10,30 +10,33 @@
   tags:
     - reset-bls-entries
   tasks:
-    - name: Get machine ID
-      ansible.builtin.command: cat /etc/machine-id
-      register: machine_id
-      check_mode: false
+    - name: Reset BLS entries on RedHat-based systems
+      when: ansible_facts.os_family == 'RedHat'
+      block:
+        - name: Get machine ID
+          ansible.builtin.command: cat /etc/machine-id
+          register: machine_id
+          check_mode: false
 
-    - name: Find entries with wrong machine ID
-      ansible.builtin.find:
-        paths: /boot/loader/entries
-        patterns: "*.conf"
-      register: bls_entries
-      check_mode: false
+        - name: Find entries with wrong machine ID
+          ansible.builtin.find:
+            paths: /boot/loader/entries
+            patterns: "*.conf"
+          register: bls_entries
+          check_mode: false
 
-    # We set force to false to avoid replacing an existing BLS entry with the
-    # correct machine ID.
-    - name: Rename entries with wrong machine ID
-      ansible.builtin.copy:
-        src: /boot/loader/entries/{{ item }}
-        dest: /boot/loader/entries/{{ item | ansible.builtin.regex_replace('^[a-f0-9]*', machine_id.stdout) }}
-        force: false
-        remote_src: true
-      with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
+        # We set force to false to avoid replacing an existing BLS entry with the
+        # correct machine ID.
+        - name: Rename entries with wrong machine ID
+          ansible.builtin.copy:
+            src: /boot/loader/entries/{{ item }}
+            dest: /boot/loader/entries/{{ item | ansible.builtin.regex_replace('^[a-f0-9]*', machine_id.stdout) }}
+            force: false
+            remote_src: true
+          with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
 
-    - name: Remove entries with wrong machine ID
-      ansible.builtin.file:
-        path: /boot/loader/entries/{{ item }}
-        state: absent
-      with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"
+        - name: Remove entries with wrong machine ID
+          ansible.builtin.file:
+            path: /boot/loader/entries/{{ item }}
+            state: absent
+          with_items: "{{ bls_entries.files | map(attribute='path') | reject('search', machine_id.stdout) | map('basename') }}"

etc/kayobe/hooks/overcloud-host-package-update/post.d/20-reset-bls-entries

@@ -0,0 +1 @@
+../../../ansible/maintenance/reset-bls-entries.yml

etc/kayobe/hooks/overcloud-host-package-update/post.d/releasenotes/notes/reset-bls-entries-20375af82dfd3517.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Adds a hook to automatically fix BLS configuration files under
+    ``/boot/loader/entries`` after overcloud host package update.