lists -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d492a78..8dec0bc 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -69,8 +69,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  lists:
-    - bendel.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org

diff --git a/hieradata/nodes/bendel.debian.org.yaml b/hieradata/nodes/bendel.debian.org.yaml
index 68fcfea..0796435 100644 (file)
--- a/hieradata/nodes/bendel.debian.org.yaml
+++ b/hieradata/nodes/bendel.debian.org.yaml
@@ -1,2 +1,5 @@
---- 
+---
+classes:
+  - roles::lists
+
 postfix::manage_maincf: false

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 57ada6b..69bd625 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -132,10 +132,6 @@ class roles {
                include roles::security_tracker
        }
 
-       if has_role('lists') {
-               include roles::lists
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }