1 From af1da8e54d08caa065243077f601801bbc8eb8e0 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Fri, 3 Apr 2020 17:03:53 +0800
4 Subject: [PATCH] lvm.pp: remove lvmetad
6 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
8 puppet-manifests/src/modules/platform/manifests/lvm.pp | 18 +-----------------
9 1 file changed, 1 insertion(+), 17 deletions(-)
11 diff --git a/puppet-manifests/src/modules/platform/manifests/lvm.pp b/puppet-manifests/src/modules/platform/manifests/lvm.pp
12 index cf16e54..64533b9 100644
13 --- a/puppet-manifests/src/modules/platform/manifests/lvm.pp
14 +++ b/puppet-manifests/src/modules/platform/manifests/lvm.pp
15 @@ -7,23 +7,7 @@ class platform::lvm::params (
17 inherits platform::lvm::params {
19 - # Mask socket unit as well to make sure
20 - # systemd socket activation does not happen
21 - service { 'lvm2-lvmetad.socket':
22 - ensure => 'stopped',
25 - # Masking service unit ensures that it is not started again
26 - -> service { 'lvm2-lvmetad':
27 - ensure => 'stopped',
30 - # Since masking is changing unit symlinks to point to /dev/null,
31 - # we need to reload systemd configuration
32 - -> exec { 'lvmetad-systemd-daemon-reload':
33 - command => 'systemctl daemon-reload',
35 - -> file_line { 'use_lvmetad':
36 + file_line { 'use_lvmetad':
37 path => '/etc/lvm/lvm.conf',
38 match => '^[^#]*use_lvmetad = 1',
39 line => ' use_lvmetad = 0',