From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 14 Sep 2019 21:13:02 +0000 (+0200)
Subject: alioth_archive -> hiera role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=739f7d91d01462cee375fc2d7775975e5a673ea4;p=mirror%2Fdsa-puppet.git

alioth_archive -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a7d849e7..0baf68f2f 100644
--- 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
index 000000000..0e580c1bc
--- /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 e8320d4d4..d2497f0d8 100644
--- 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
 	}