move loghost from a "role" in hieradata/common.yaml to a role that is included via...

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f3391ad..b25cfd6 100644 (file)
--- 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 (file)
index 0000000..6dfdd68
--- /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 (file)
index 0000000..6dfdd68
--- /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 (file)
index 0000000..6dfdd68
--- /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 13ac016..4cae49c 100644 (file)
--- 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
-       }
 }