migrate packagesmaster and packagesqamaster role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e72b759..71b1519 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -60,12 +60,6 @@ roles:
   nagiosmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
-  packagesmaster:
-    # XXX - exim config flag only
-    - picconi.debian.org
-  packagesqamaster:
-    # XXX - exim config flag
-    - quantz.debian.org
   security_master:
     # XXX - used by ferm templates/defs.conf.erb
     - seger.debian.org

diff --git a/hieradata/nodes/picconi.debian.org.yaml b/hieradata/nodes/picconi.debian.org.yaml
index d671e4a..96e5afa 100644 (file)
--- a/hieradata/nodes/picconi.debian.org.yaml
+++ b/hieradata/nodes/picconi.debian.org.yaml
@@ -1,3 +1,5 @@
 ---
 classes:
   - roles::packages
+
+exim::is_packagesmaster: true

diff --git a/hieradata/nodes/quantz.debian.org.yaml b/hieradata/nodes/quantz.debian.org.yaml
index c391033..1b90037 100644 (file)
--- a/hieradata/nodes/quantz.debian.org.yaml
+++ b/hieradata/nodes/quantz.debian.org.yaml
@@ -5,3 +5,5 @@ classes:
 apache2::mpm: prefork
 # qa scripts sometimes needs a lot of memory.  raise the limit to 300 MB
 apache2::rlimitmem: 314572800
+
+exim::is_packagesqamaster: true

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 3596c31..a76653e 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -2,11 +2,9 @@ class exim (
   Boolean $is_bugsmx = false,
   Boolean $is_mailrelay = false,
   Boolean $is_rtmaster = false,
+  Boolean $is_packagesmaster = false,
+  Boolean $is_packagesqamaster = false,
 ) {
-
-  $is_packagesmaster = has_role('packagesmaster')
-  $is_packagesqamaster = has_role('packagesqamaster')
-
   include exim::vdomain::setup
   include debian_org::mail_incoming_port
 

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7d4addb..8980ed9 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -61,11 +61,6 @@ class roles {
                include postgres::backup_server
        }
 
-
-       if has_role('packagesqamaster') {
-               ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
                include roles::snapshot
        }

diff --git a/modules/roles/manifests/packagesqamaster.pp b/modules/roles/manifests/packagesqamaster.pp
new file mode 100644 (file)
index 0000000..fe72444
--- /dev/null
+++ b/modules/roles/manifests/packagesqamaster.pp
@@ -0,0 +1,4 @@
+class roles::packagesqamaster {
+  include apache2
+  ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+}