From 8a6305d2d56946abc21205bab4b7a764d18649e8 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 22:50:21 +0000
Subject: [PATCH] Turn apache2_security_mirror into a security_mirror role

---
 hieradata/common.yaml              | 12 ++++++++++++
 modules/debian-org/misc/local.yaml | 12 ------------
 modules/roles/manifests/init.pp    |  4 +---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 75a759ad0..ad6ccb1bc 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -110,6 +110,18 @@ roles:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
+  security_mirror:
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
+    - santoro.debian.org
+    - setoguchi.debian.org
+    - sechter.debian.org
+    - steffani.debian.org
+    - villa.debian.org
+    - wieck.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
   sso:
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 008ffd39a..7795a69ec 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -141,18 +141,6 @@ host_settings:
     - tye.debian.org
     - vento.debian.org
     - wuiet.debian.org
-  apache2_security_mirror:
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - lobos.debian.org
-    - santoro.debian.org
-    - setoguchi.debian.org
-    - sechter.debian.org
-    - steffani.debian.org
-    - villa.debian.org
-    - wieck.debian.org
   not-bacula-client:
     # decommissioning
     - rautavaara.debian.org
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2cd90de33..a6d664776 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,11 +71,9 @@ class roles {
 		}
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
-
 	if has_role('mirror_debug') {
 		include roles::debug_mirror
 	}
-- 
2.20.1