vote -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ec348c4..0e0dd2f 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -180,8 +180,6 @@ roles:
     - ticharich.debian.org
   udd:
     - ullmann.debian.org
-  vote:
-    - vento.debian.org
   wiki:
     - wilder.debian.org
   www_master:

diff --git a/hieradata/nodes/vento.debian.org.yaml b/hieradata/nodes/vento.debian.org.yaml
new file mode 100644 (file)
index 0000000..796f4e3
--- /dev/null
+++ b/hieradata/nodes/vento.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::vote

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8ce734b..35c277a 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -109,10 +109,6 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('vote') {
-               include roles::vote
-       }
-
        if has_role('security_tracker') {
                include roles::security_tracker
        }

diff --git a/modules/roles/manifests/vote.pp b/modules/roles/manifests/vote.pp
index dacb24f..a544e8e 100644 (file)
--- a/modules/roles/manifests/vote.pp
+++ b/modules/roles/manifests/vote.pp
@@ -1,4 +1,6 @@
 class roles::vote {
+       include apache2
+
        ssl::service { 'vote.debian.org':
                notify  => Exec['service apache2 reload'],
                key => true,