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

salsa -> hiera role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5a199d53b..e4160698f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -309,8 +309,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  salsa.debian.org:
-    - godard.debian.org
   insecure_ssl:
     - debussy.debian.org
     - godard.debian.org
diff --git a/hieradata/nodes/godard.debian.org.yaml b/hieradata/nodes/godard.debian.org.yaml
new file mode 100644
index 000000000..02bd9124c
--- /dev/null
+++ b/hieradata/nodes/godard.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - salsa
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6f06d746d..d75913e00 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -316,10 +316,6 @@ class roles {
 		include bacula::storage
 	}
 
-	if has_role('salsa.debian.org') {
-		include salsa
-	}
-
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}