salsa -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5a199d5..e416069 100644 (file)
--- 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 (file)
index 0000000..02bd912
--- /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 6f06d74..d75913e 100644 (file)
--- 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
        }