weblog_destination -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9eb7378..b4a64d0 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -195,8 +195,6 @@ roles:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  weblog_destination:
-    - wolkenstein.debian.org
   wiki:
     - wilder.debian.org
   www_master:

diff --git a/hieradata/nodes/wolkenstein.debian.org.yaml b/hieradata/nodes/wolkenstein.debian.org.yaml
index 3ccff77..f1704b5 100644 (file)
--- a/hieradata/nodes/wolkenstein.debian.org.yaml
+++ b/hieradata/nodes/wolkenstein.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
   - roles::static_source
+  - roles::weblog_destination

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5ee825b..0947821 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -132,10 +132,6 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('weblog_destination') {
-               include roles::weblog_destination
-       }
-
        if has_role('vote') {
                include roles::vote
        }