no hosts (directly) in roles::archvsync_base

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0272132..98db204 100644 (file)
--- 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 ac8b8e9..a92297b 100644 (file)
--- 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 91fdaa4..0a3e136 100644 (file)
--- 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