From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 21:28:05 +0000 (+0200)
Subject: no hosts (directly) in roles::archvsync_base
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=992b52bab4325e38d1738e21652d052ae4cc90e5;p=mirror%2Fdsa-puppet.git

no hosts (directly) in roles::archvsync_base
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0272132dd..98db2046a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -118,9 +118,6 @@ roles:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
-  archvsync_base_additional:
-  # this is usually pulled in by *-mirror or syncproxy roles
-    - dummy
   security_master:
     - seger.debian.org
   security_mirror:
diff --git a/modules/roles/manifests/archvsync_base.pp b/modules/roles/manifests/archvsync_base.pp
index ac8b8e9a1..a92297b48 100644
--- a/modules/roles/manifests/archvsync_base.pp
+++ b/modules/roles/manifests/archvsync_base.pp
@@ -1,3 +1,4 @@
+# this is usually pulled in by *-mirror or syncproxy roles
 class roles::archvsync_base {
 	file { '/srv/mirrors':
 		ensure => directory,
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 91fdaa458..0a3e136b5 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -38,10 +38,6 @@ class roles {
 		include roles::manpages_dyn
 	}
 
-	if has_role('archvsync_base_additional') {
-		include archvsync_base
-	}
-
 	# archive.debian.org
 	if has_role('historical_mirror') {
 		include roles::historical_mirror