From 6cd0b2c073d84a7e4ba19161ebee856bcd8d2960 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Thu, 26 Nov 2015 17:43:59 +0000 Subject: [PATCH] rename modules/lvm to modules/dsa_lvm Signed-off-by: Martin Zobel-Helas --- manifests/site.pp | 2 +- modules/{lvm => dsa_lvm}/files/lvm-bm-blades.conf | 0 modules/{lvm => dsa_lvm}/files/lvm-csail-nodeX-ganeti.conf | 0 modules/{lvm => dsa_lvm}/files/lvm-grnet-nodeX-ganeti.conf | 0 modules/{lvm => dsa_lvm}/files/lvm-prokofiev.conf | 0 modules/{lvm => dsa_lvm}/files/lvm-ubc-ganeti-p410.conf | 0 modules/{lvm => dsa_lvm}/files/lvm-ubc-ganeti.conf | 0 modules/{lvm => dsa_lvm}/manifests/init.pp | 4 ++-- 8 files changed, 3 insertions(+), 3 deletions(-) rename modules/{lvm => dsa_lvm}/files/lvm-bm-blades.conf (100%) rename modules/{lvm => dsa_lvm}/files/lvm-csail-nodeX-ganeti.conf (100%) rename modules/{lvm => dsa_lvm}/files/lvm-grnet-nodeX-ganeti.conf (100%) rename modules/{lvm => dsa_lvm}/files/lvm-prokofiev.conf (100%) rename modules/{lvm => dsa_lvm}/files/lvm-ubc-ganeti-p410.conf (100%) rename modules/{lvm => dsa_lvm}/files/lvm-ubc-ganeti.conf (100%) rename modules/{lvm => dsa_lvm}/manifests/init.pp (90%) diff --git a/manifests/site.pp b/manifests/site.pp index 93b79b219..c54244da3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -37,7 +37,7 @@ node default { include unbound include bacula::client include autofs - include lvm + include dsa_lvm include grub include multipath if $::lsbdistcodename == squeeze { diff --git a/modules/lvm/files/lvm-bm-blades.conf b/modules/dsa_lvm/files/lvm-bm-blades.conf similarity index 100% rename from modules/lvm/files/lvm-bm-blades.conf rename to modules/dsa_lvm/files/lvm-bm-blades.conf diff --git a/modules/lvm/files/lvm-csail-nodeX-ganeti.conf b/modules/dsa_lvm/files/lvm-csail-nodeX-ganeti.conf similarity index 100% rename from modules/lvm/files/lvm-csail-nodeX-ganeti.conf rename to modules/dsa_lvm/files/lvm-csail-nodeX-ganeti.conf diff --git a/modules/lvm/files/lvm-grnet-nodeX-ganeti.conf b/modules/dsa_lvm/files/lvm-grnet-nodeX-ganeti.conf similarity index 100% rename from modules/lvm/files/lvm-grnet-nodeX-ganeti.conf rename to modules/dsa_lvm/files/lvm-grnet-nodeX-ganeti.conf diff --git a/modules/lvm/files/lvm-prokofiev.conf b/modules/dsa_lvm/files/lvm-prokofiev.conf similarity index 100% rename from modules/lvm/files/lvm-prokofiev.conf rename to modules/dsa_lvm/files/lvm-prokofiev.conf diff --git a/modules/lvm/files/lvm-ubc-ganeti-p410.conf b/modules/dsa_lvm/files/lvm-ubc-ganeti-p410.conf similarity index 100% rename from modules/lvm/files/lvm-ubc-ganeti-p410.conf rename to modules/dsa_lvm/files/lvm-ubc-ganeti-p410.conf diff --git a/modules/lvm/files/lvm-ubc-ganeti.conf b/modules/dsa_lvm/files/lvm-ubc-ganeti.conf similarity index 100% rename from modules/lvm/files/lvm-ubc-ganeti.conf rename to modules/dsa_lvm/files/lvm-ubc-ganeti.conf diff --git a/modules/lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp similarity index 90% rename from modules/lvm/manifests/init.pp rename to modules/dsa_lvm/manifests/init.pp index 34663ae52..345e411e0 100644 --- a/modules/lvm/manifests/init.pp +++ b/modules/dsa_lvm/manifests/init.pp @@ -1,4 +1,4 @@ -class lvm { +class dsa_lvm { case $::hostname { ubc-bl8,ubc-bl4: { $conffile = 'lvm-ubc-ganeti.conf' @@ -29,7 +29,7 @@ class lvm { } file { '/etc/lvm/lvm.conf': - source => "puppet:///modules/lvm/$conffile", + source => "puppet:///modules/dsa_lvm/$conffile", } } } -- 2.20.1