From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 3 Jul 2014 09:16:18 +0000 (+0200)
Subject: Deploy qa.d.o cert on qamaster
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=525dd7743f792944eb3aa7551e2059f83d9fc4dd;p=mirror%2Fdsa-puppet.git

Deploy qa.d.o cert on qamaster
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e4ceb86b5..556c220e6 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -65,6 +65,8 @@ roles:
     - rapoport.debian.org
   puppetmaster:
     - handel.debian.org
+  qamaster:
+    - quantz.debian.org
   release:
     - franck.debian.org
   rtmaster:
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 037e74888..9caaa5b0b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -196,6 +196,12 @@ class roles {
 		}
 	}
 
+	if has_role('qamaster') {
+		ssl::service { 'qa.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if has_role('packagesqamaster') {
 		ssl::service { 'packages.qa.debian.org':
 			notify => Service['apache2'],