From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 29 Aug 2019 17:20:51 +0000 (+0200)
Subject: transition grnet cluster to new lvm config
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=5a9ed83676844b312533a2011e5d21a3242f430c;p=mirror%2Fdsa-puppet.git

transition grnet cluster to new lvm config
---

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/.*/" ]',
+  }
+}