tracker -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0e0dd2f..83b5721 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -176,8 +176,6 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  tracker:
-    - ticharich.debian.org
   udd:
     - ullmann.debian.org
   wiki:

diff --git a/hieradata/nodes/ticharich.debian.org.yaml b/hieradata/nodes/ticharich.debian.org.yaml
new file mode 100644 (file)
index 0000000..07f1242
--- /dev/null
+++ b/hieradata/nodes/ticharich.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::tracker

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 35c277a..cf85807 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -129,10 +129,6 @@ class roles {
                include roles::sso_rp
        }
 
-       if has_role('tracker') {
-               include roles::tracker
-       }
-
        if has_role('piuparts') {
                include roles::piuparts
        }

diff --git a/modules/roles/manifests/tracker.pp b/modules/roles/manifests/tracker.pp
index ff7e8d4..930e164 100644 (file)
--- a/modules/roles/manifests/tracker.pp
+++ b/modules/roles/manifests/tracker.pp
@@ -1,4 +1,5 @@
 class roles::tracker {
+  include apache2
   package { 'libapache2-mod-wsgi-py3': ensure => installed, }
   apache2::module { 'wsgi': require => Package['libapache2-mod-wsgi-py3'] }
   ssl::service { 'tracker.debian.org':