From c2fc9ef577528adc0d54f87640f658c32584738d Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Thu, 26 Nov 2015 17:55:13 +0000 Subject: [PATCH] dsa_lvm module - lint cleanup (as suggested by Martin Alfke) - case uses strings - always set ensure on file resource types - variables in strings need curly brackets Signed-off-by: Martin Zobel-Helas --- modules/dsa_lvm/manifests/init.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp index 345e411e0..1c1a53260 100644 --- a/modules/dsa_lvm/manifests/init.pp +++ b/modules/dsa_lvm/manifests/init.pp @@ -1,21 +1,21 @@ class dsa_lvm { case $::hostname { - ubc-bl8,ubc-bl4: { + 'ubc-bl8','ubc-bl4': { $conffile = 'lvm-ubc-ganeti.conf' } - ubc-bl3,ubc-bl7,ubc-bl2,ubc-bl6: { + 'ubc-bl3','ubc-bl7','ubc-bl2','ubc-bl6': { $conffile = 'lvm-ubc-ganeti-p410.conf' } - csail-node01,csail-node02: { + 'csail-node01','csail-node02': { $conffile = 'lvm-csail-nodeX-ganeti.conf' } - grnet-node01,grnet-node02: { + 'grnet-node01','grnet-node02': { $conffile = 'lvm-grnet-nodeX-ganeti.conf' } - bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12: { + 'bm-bl1','bm-bl2','bm-bl3','bm-bl4','bm-bl5','bm-bl6','bm-bl7','bm-bl8','bm-bl9','bm-bl10','bm-bl11','bm-bl12': { $conffile = 'lvm-bm-blades.conf' } - prokofiev: { + 'prokofiev': { $conffile = 'lvm-prokofiev.conf' } default: { @@ -29,7 +29,8 @@ class dsa_lvm { } file { '/etc/lvm/lvm.conf': - source => "puppet:///modules/dsa_lvm/$conffile", + ensure => file, + source => "puppet:///modules/dsa_lvm/${conffile}", } } } -- 2.20.1