From 719d5c9f9c99da5789ff0a42db53499d701e07e3 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 29 Aug 2019 17:56:31 +0200
Subject: [PATCH] move the ubc-enc2bl01 LVM config to a profile included via
 hiera using the new LVM module

---
 hieradata/nodes/ubc-enc2bl01.debian.org.yaml | 2 ++
 modules/dsa_lvm/manifests/init.pp            | 2 +-
 modules/profile/manifests/lvm/ganeti2_ubc.pp | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 hieradata/nodes/ubc-enc2bl01.debian.org.yaml
 create mode 100644 modules/profile/manifests/lvm/ganeti2_ubc.pp

diff --git a/hieradata/nodes/ubc-enc2bl01.debian.org.yaml b/hieradata/nodes/ubc-enc2bl01.debian.org.yaml
new file mode 100644
index 000000000..f7e9e4f5f
--- /dev/null
+++ b/hieradata/nodes/ubc-enc2bl01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - profile::lvm::ganeti2_ubc
diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp
index 6cc7e014f..ffac6d6f9 100644
--- a/modules/dsa_lvm/manifests/init.pp
+++ b/modules/dsa_lvm/manifests/init.pp
@@ -17,7 +17,7 @@ class dsa_lvm {
 				'prokofiev': {
 					$conffile = 'lvm-prokofiev.conf'
 				}
-				'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
+				'XXXubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': {
 					$conffile = 'lvm-ubc-ganeti2.conf'
 				}
 				'conova-node01','conova-node02': {
diff --git a/modules/profile/manifests/lvm/ganeti2_ubc.pp b/modules/profile/manifests/lvm/ganeti2_ubc.pp
new file mode 100644
index 000000000..04fe51519
--- /dev/null
+++ b/modules/profile/manifests/lvm/ganeti2_ubc.pp
@@ -0,0 +1,6 @@
+# LVM config for the ~2016 blades that make up ganeti2.ubc.debian.org
+class profile::lvm::ganeti2_ubc {
+  class { 'lvm':
+    global_filter  => '[ "a|^/dev/sda[0-9]*$|", "r/.*/" ]',
+  }
+}
-- 
2.20.1