keyring -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b4a64d0..0339610 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -71,8 +71,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  keyring:
-    - kaufmann.debian.org
   lists:
     - bendel.debian.org
   mailrelay:

diff --git a/hieradata/nodes/kaufmann.debian.org.yaml b/hieradata/nodes/kaufmann.debian.org.yaml
index 3ccff77..6cd1651 100644 (file)
--- a/hieradata/nodes/kaufmann.debian.org.yaml
+++ b/hieradata/nodes/kaufmann.debian.org.yaml
@@ -1,2 +1,3 @@
 classes:
   - roles::static_source
+  - roles::keyring

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0947821..4d10b92 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -100,10 +100,6 @@ class roles {
                ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('keyring') {
-               include roles::keyring
-       }
-
        if has_role('wiki') {
                include roles::wiki
        }