From 2449557935018f7b7afcf9cd9026ec13bc3b4a9b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 14:57:01 +0200
Subject: [PATCH] piuparts* -> hiera role; explicitly include apache2

---
 hieradata/common.yaml                            | 5 -----
 hieradata/nodes/pejacevic.debian.org.yaml        | 3 +++
 hieradata/nodes/piu-slave-bm-a.debian.org.yaml   | 3 +++
 hieradata/nodes/piu-slave-ubc-01.debian.org.yaml | 3 +++
 modules/roles/manifests/init.pp                  | 7 -------
 modules/roles/manifests/piuparts.pp              | 1 +
 6 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 hieradata/nodes/pejacevic.debian.org.yaml
 create mode 100644 hieradata/nodes/piu-slave-bm-a.debian.org.yaml
 create mode 100644 hieradata/nodes/piu-slave-ubc-01.debian.org.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 83b5721d5..127795dff 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -87,11 +87,6 @@ roles:
     - quantz.debian.org
   people:
     - paradis.debian.org
-  piuparts:
-    - pejacevic.debian.org
-  piuparts_slave:
-    - piu-slave-bm-a.debian.org
-    - piu-slave-ubc-01.debian.org
   popcon:
     - pinel.debian.org
   pubsub:
diff --git a/hieradata/nodes/pejacevic.debian.org.yaml b/hieradata/nodes/pejacevic.debian.org.yaml
new file mode 100644
index 000000000..e4cafbb24
--- /dev/null
+++ b/hieradata/nodes/pejacevic.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::piuparts
diff --git a/hieradata/nodes/piu-slave-bm-a.debian.org.yaml b/hieradata/nodes/piu-slave-bm-a.debian.org.yaml
new file mode 100644
index 000000000..830b2f2e2
--- /dev/null
+++ b/hieradata/nodes/piu-slave-bm-a.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::piuparts_slave
diff --git a/hieradata/nodes/piu-slave-ubc-01.debian.org.yaml b/hieradata/nodes/piu-slave-ubc-01.debian.org.yaml
new file mode 100644
index 000000000..830b2f2e2
--- /dev/null
+++ b/hieradata/nodes/piu-slave-ubc-01.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::piuparts_slave
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index cf85807f0..09bf30827 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -129,13 +129,6 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('piuparts') {
-		include roles::piuparts
-	}
-	if has_role('piuparts_slave') {
-		include roles::piuparts_slave
-	}
-
 	if has_role('contributors') {
 		include roles::contributors
 	}
diff --git a/modules/roles/manifests/piuparts.pp b/modules/roles/manifests/piuparts.pp
index e92fb4151..8b7e3b4f8 100644
--- a/modules/roles/manifests/piuparts.pp
+++ b/modules/roles/manifests/piuparts.pp
@@ -1,4 +1,5 @@
 class roles::piuparts {
+  include apache2
   ssl::service { 'piuparts.debian.org':
     notify => Exec['service apache2 reload'],
     key    => true,
-- 
2.20.1