Make jenkins a proper role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d62a933..83225d8 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -57,8 +57,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  jenkins:
-    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
   lists:

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ae258ef..3960f1e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -205,10 +205,6 @@ class roles {
                include roles::rtc
        }
 
-       if has_role('jenkins') {
-               include roles::jenkins
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }