From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 21:51:31 +0000 (+0200)
Subject: weblog_destination -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8793e006b4a2d3e0c24a5315b6cd3615dd57a3bb;p=mirror%2Fdsa-puppet.git

weblog_destination -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 9eb737897..b4a64d0bb 100644
--- 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 3ccff770b..f1704b5f0 100644
--- 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 5ee825bc4..09478211c 100644
--- 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
 	}