From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 07:18:22 +0000 (+0200)
Subject: bugs_mirror -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=049ae220bcdce39d661c3b330634371c92e38006;p=mirror%2Fdsa-puppet.git

bugs_mirror -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f75b60921..d492a7871 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -37,8 +37,6 @@ roles:
     - buxtehude.debian.org
   bugs_master:
     - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
diff --git a/hieradata/nodes/beach.debian.org.yaml b/hieradata/nodes/beach.debian.org.yaml
new file mode 100644
index 000000000..a202ad6de
--- /dev/null
+++ b/hieradata/nodes/beach.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - bugs_mirror
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8130551b3..57ada6b7f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,10 +15,6 @@ class roles {
 		include nagios::server
 	}
 
-	if has_role('bugs_mirror') {
-		include roles::bugs_mirror
-	}
-
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
 			notify  => Exec['service apache2 reload'],