From 49cb5adf921603dbf4081d221c49670bc3e1d8b4 Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 6 Jul 2021 16:09:17 +0200 Subject: [PATCH 1/4] evolinux-base: Fix hw card detect Run the shell command as bash instead of sh; otherwise it will fail because of the set -o pipefail --- evolinux-base/tasks/hardware.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 34ed46b3..3f5d4232 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -29,7 +29,9 @@ # HP gen <10: Hewlett-Packard Company Smart Array # HP gen >=10: Adaptec Smart Storage PQI - name: Detect if RAID is installed - shell: "set -o pipefail && lspci -q | grep -e 'RAID bus controller' -e 'Serial Attached SCSI controller'" + shell: + cmd: "set -o pipefail && lspci -q | grep -e 'RAID bus controller' -e 'Serial Attached SCSI controller'" + executable: /bin/bash check_mode: no register: raidmodel changed_when: "'FAILED' in raidmodel.stdout" From 7a089f88af4c596c2f771a027feb138926a5978d Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 6 Jul 2021 16:09:54 +0200 Subject: [PATCH 2/4] Correct typo in var name trusted_gpg_keyring.stat.present instead of _trusted_gpg_keyring.stat.present --- evolinux-base/tasks/hardware.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 3f5d4232..49b8af8e 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -117,7 +117,7 @@ keyring: /etc/apt/trusted.gpg state: absent when: - - trusted_gpg_keyring.stat.present + - _trusted_gpg_keyring.stat.present - ansible_distribution_major_version is version('9', '>=') - name: HWRaid GPG key is installed From 8e6c08b81b0a27f0922e99895222eeb8384e550a Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 6 Jul 2021 16:12:14 +0200 Subject: [PATCH 3/4] evolinux-base: Change the pattern of MegaRAID detect Seems the card names may somethings between 'MegaRAID' and 'SAS' I'll take the short and easy path as I think MegaRAID is enough in most cases --- evolinux-base/tasks/hardware.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 49b8af8e..69f4da79 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -153,6 +153,6 @@ name: megaclisas-statusd enabled: true state: started - when: "'MegaRAID SAS' in raidmodel.stdout" + when: "'MegaRAID' in raidmodel.stdout" - meta: flush_handlers From b362fadc80a8cc5e297df1a128acd9ba71b20b1e Mon Sep 17 00:00:00 2001 From: Ludovic Poujol Date: Tue, 6 Jul 2021 16:22:45 +0200 Subject: [PATCH 4/4] typo (again) + not using trusted.gpg isn't restricted to debian 9+ --- evolinux-base/tasks/hardware.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index 69f4da79..127988a9 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -116,9 +116,7 @@ id: "23B3D3B4" keyring: /etc/apt/trusted.gpg state: absent - when: - - _trusted_gpg_keyring.stat.present - - ansible_distribution_major_version is version('9', '>=') + when: _trusted_gpg_keyring.stat.exists - name: HWRaid GPG key is installed copy: