From a8bfab87f9a61c7678d1dba0928be09fd48dafa9 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 29 Aug 2019 20:32:36 +0200
Subject: [PATCH] move loghost from a "role" in hieradata/common.yaml to a role
 that is included via hiera

---
 hieradata/common.yaml                             | 4 ----
 hieradata/nodes/loghost-grnet-01.debian.org.yaml  | 2 ++
 hieradata/nodes/loghost-osuosl-01.debian.org.yaml | 2 ++
 hieradata/nodes/lotti.debian.org.yaml             | 2 ++
 modules/roles/manifests/init.pp                   | 4 ----
 5 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 hieradata/nodes/loghost-grnet-01.debian.org.yaml
 create mode 100644 hieradata/nodes/loghost-osuosl-01.debian.org.yaml
 create mode 100644 hieradata/nodes/lotti.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f3391ad85..b25cfd641 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -374,10 +374,6 @@ roles:
     - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
-  loghost:
-    - loghost-grnet-01.debian.org
-    - loghost-osuosl-01.debian.org
-    - lotti.debian.org
 
 classes:
   - site
diff --git a/hieradata/nodes/loghost-grnet-01.debian.org.yaml b/hieradata/nodes/loghost-grnet-01.debian.org.yaml
new file mode 100644
index 000000000..6dfdd6847
--- /dev/null
+++ b/hieradata/nodes/loghost-grnet-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::loghost
diff --git a/hieradata/nodes/loghost-osuosl-01.debian.org.yaml b/hieradata/nodes/loghost-osuosl-01.debian.org.yaml
new file mode 100644
index 000000000..6dfdd6847
--- /dev/null
+++ b/hieradata/nodes/loghost-osuosl-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::loghost
diff --git a/hieradata/nodes/lotti.debian.org.yaml b/hieradata/nodes/lotti.debian.org.yaml
new file mode 100644
index 000000000..6dfdd6847
--- /dev/null
+++ b/hieradata/nodes/lotti.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::loghost
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 13ac01626..4cae49c19 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -394,8 +394,4 @@ class roles {
 	if has_role('anonscm') {
 		include roles::anonscm
 	}
-
-	if has_role('loghost') {
-		include roles::loghost
-	}
 }
-- 
2.20.1