nm -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 5462936..a4f01d5 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -72,8 +72,6 @@ roles:
     - menotti.debian.org
   nagiosmaster:
     - tchaikovsky.debian.org
-  nm:
-    - nono.debian.org
   packages:
     - picconi.debian.org
     - pkgmirror-csail.debian.org

diff --git a/hieradata/nodes/nono.debian.org.yaml b/hieradata/nodes/nono.debian.org.yaml
new file mode 100644 (file)
index 0000000..6f30e7f
--- /dev/null
+++ b/hieradata/nodes/nono.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - roles::nm

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6afdaa4..ca72b6b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -123,10 +123,6 @@ class roles {
                include roles::contributors
        }
 
-       if has_role('nm') {
-               include roles::nm
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }

diff --git a/modules/roles/manifests/nm.pp b/modules/roles/manifests/nm.pp
index 3a8ee2f..262bb20 100644 (file)
--- a/modules/roles/manifests/nm.pp
+++ b/modules/roles/manifests/nm.pp
@@ -1,6 +1,7 @@
 class roles::nm {
-       ssl::service { 'nm.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
-       }
+  include apache2
+  ssl::service { 'nm.debian.org':
+    notify  => Exec['service apache2 reload'],
+    key => true,
+  }
 }