From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 19:58:51 +0000 (+0200)
Subject: migrate packagesmaster and packagesqamaster role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4dcb0bb6ab00da402d5939588bf5793a917f8b02;p=mirror%2Fdsa-puppet.git

migrate packagesmaster and packagesqamaster role
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e72b759a6..71b1519a3 100644
--- 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 d671e4a97..96e5afa81 100644
--- 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 c391033a1..1b9003781 100644
--- 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 3596c318e..a76653ea2 100644
--- 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 7d4addb25..8980ed957 100644
--- 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
index 000000000..fe7244426
--- /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, }
+}