alioth_archive -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a7d849..0baf68f 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -341,8 +341,6 @@ roles:
     - sallinen.debian.org
   cdbuilder_local_mirror:
     - casulana.debian.org
-  alioth_archive:
-    - grabbe.debian.org
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org

diff --git a/hieradata/nodes/grabbe.debian.org.yaml b/hieradata/nodes/grabbe.debian.org.yaml
new file mode 100644 (file)
index 0000000..0e580c1
--- /dev/null
+++ b/hieradata/nodes/grabbe.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::alioth_archive

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e8320d4..d2497f0 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -355,9 +355,6 @@ class roles {
                include roles::cdbuilder_local_mirror
        }
 
-       if has_role('alioth_archive') {
-               include roles::alioth_archive
-       }
        if has_role('anonscm') {
                include roles::anonscm
        }