From f2e61d6e8b1d9ef7298264d5010b3e019832e748 Mon Sep 17 00:00:00 2001 From: Michael Feger Date: Sun, 9 Jan 2022 11:47:48 +0100 Subject: [PATCH 1/3] fix lvm_service package names for centos 8 stream --- linux/map.jinja | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux/map.jinja b/linux/map.jinja index f1856d2..3b1fcf6 100644 --- a/linux/map.jinja +++ b/linux/map.jinja @@ -393,6 +393,9 @@ Debian: }, }, }, merge=salt['grains.filter_by']({ + 'CentOS Stream 8': { + 'lvm_services': ['lvm2-lvmpolld', 'lvm2-monitor'], + }, 'focal': { 'lvm_services': ['lvm2-monitor'], }, From 78f775ca1beeb8d7d7046f50ef149fa9e2699179 Mon Sep 17 00:00:00 2001 From: Michael Feger Date: Sun, 9 Jan 2022 11:49:37 +0100 Subject: [PATCH 2/3] Revert "fix lvm_service package names for centos 8 stream" This reverts commit f2e61d6e8b1d9ef7298264d5010b3e019832e748. --- linux/map.jinja | 3 --- 1 file changed, 3 deletions(-) diff --git a/linux/map.jinja b/linux/map.jinja index 3b1fcf6..f1856d2 100644 --- a/linux/map.jinja +++ b/linux/map.jinja @@ -393,9 +393,6 @@ Debian: }, }, }, merge=salt['grains.filter_by']({ - 'CentOS Stream 8': { - 'lvm_services': ['lvm2-lvmpolld', 'lvm2-monitor'], - }, 'focal': { 'lvm_services': ['lvm2-monitor'], }, From b8dd41460a65c33b3235b853fa54214971b064a9 Mon Sep 17 00:00:00 2001 From: Michael Feger Date: Thu, 23 Oct 2025 14:46:29 +0200 Subject: [PATCH 3/3] do not fail if there's no volume group (yet) --- linux/storage/lvm.sls | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux/storage/lvm.sls b/linux/storage/lvm.sls index f0ff3e5..4ac0232 100644 --- a/linux/storage/lvm.sls +++ b/linux/storage/lvm.sls @@ -52,7 +52,8 @@ lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}: - vgname: {{ vg.get('name', vgname) }} - size: {{ volume.size }} {%- if (volume.force is defined and volume.force is sameas true) or - (volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %} + (grains.lvm is defined and vg.get('name', vgname) in grains.lvm and + volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %} - force: True {%- else %} - force: False @@ -60,7 +61,8 @@ lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}: - require: - lvm: lvm_vg_{{ vg.get('name', vgname) }} {%- if (volume.mount is defined) and - (volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %} + (grains.lvm is defined and vg.get('name', vgname) in grains.lvm and + volume.get('name', lvname) not in grains.lvm[vg.get('name', vgname)]) %} - require_in: - mount: {{ volume.mount.path }} {%- if not volume.mount.get('file_system', None) in ['nfs', 'nfs4', 'cifs', 'tmpfs', None] %}