piuparts* -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 83b5721..127795d 100644 (file)
--- 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 (file)
index 0000000..e4cafbb
--- /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 (file)
index 0000000..830b2f2
--- /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 (file)
index 0000000..830b2f2
--- /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 cf85807..09bf308 100644 (file)
--- 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 e92fb41..8b7e3b4 100644 (file)
--- 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,