rtmaster -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 95d7e88..7b6ed20 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -69,9 +69,6 @@ roles:
   packagesqamaster:
     # XXX - exim config flag
     - quantz.debian.org
-  rtmaster:
-    # XXX - exim config flag
-    - reger.debian.org
   security_master:
     # XXX - used by ferm templates/defs.conf.erb
     - seger.debian.org

diff --git a/hieradata/nodes/reger.debian.org.yaml b/hieradata/nodes/reger.debian.org.yaml
new file mode 100644 (file)
index 0000000..165cae8
--- /dev/null
+++ b/hieradata/nodes/reger.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::rtmaster

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index e83a9df..59b87f7 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,8 +1,9 @@
-class exim {
+class exim (
+  Boolean $is_rtmaster = false,
+) {
 
   $is_mailrelay = has_role('mailrelay')
   $is_bugsmx = has_role('bugsmx')
-  $is_rtmaster = has_role('rtmaster')
   $is_packagesmaster = has_role('packagesmaster')
   $is_packagesqamaster = has_role('packagesqamaster')
 

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 98fb71e..cac91ff 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -61,10 +61,6 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('rtmaster') {
-               include roles::rtmaster
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }