From 5a9ed83676844b312533a2011e5d21a3242f430c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 29 Aug 2019 19:20:51 +0200 Subject: [PATCH] transition grnet cluster to new lvm config --- hieradata/nodes/grnet-node01.debian.org.yaml | 2 ++ hieradata/nodes/grnet-node02.debian.org.yaml | 2 ++ modules/dsa_lvm/manifests/init.pp | 3 --- modules/profile/manifests/lvm/ganeti_grnet.pp | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 hieradata/nodes/grnet-node01.debian.org.yaml create mode 100644 hieradata/nodes/grnet-node02.debian.org.yaml create mode 100644 modules/profile/manifests/lvm/ganeti_grnet.pp diff --git a/hieradata/nodes/grnet-node01.debian.org.yaml b/hieradata/nodes/grnet-node01.debian.org.yaml new file mode 100644 index 000000000..0e03c07a8 --- /dev/null +++ b/hieradata/nodes/grnet-node01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - profile::lvm::ganeti_csail diff --git a/hieradata/nodes/grnet-node02.debian.org.yaml b/hieradata/nodes/grnet-node02.debian.org.yaml new file mode 100644 index 000000000..0e03c07a8 --- /dev/null +++ b/hieradata/nodes/grnet-node02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - profile::lvm::ganeti_csail diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp index d22192595..2e5658291 100644 --- a/modules/dsa_lvm/manifests/init.pp +++ b/modules/dsa_lvm/manifests/init.pp @@ -2,9 +2,6 @@ class dsa_lvm { case $::cluster { default: { case $::hostname { - 'grnet-node01','grnet-node02': { - $conffile = 'lvm-grnet-nodeX-ganeti.conf' - } 'prokofiev': { $conffile = 'lvm-prokofiev.conf' } diff --git a/modules/profile/manifests/lvm/ganeti_grnet.pp b/modules/profile/manifests/lvm/ganeti_grnet.pp new file mode 100644 index 000000000..cee32c166 --- /dev/null +++ b/modules/profile/manifests/lvm/ganeti_grnet.pp @@ -0,0 +1,6 @@ +# LVM config for the blades that make up ganeti.grnet.debian.org +class profile::lvm::ganeti_grnet { + class { 'lvm': + global_filter => '[ "a|^/dev/sda[0-9]*$|", "r/.*/" ]', + } +} -- 2.20.1