hiera -> hiera role; explicitly include apache2

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 97997ea..902da87 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -37,8 +37,6 @@ roles:
     - buxtehude.debian.org
   contributors:
     - nono.debian.org
-  dbmaster:
-    - draghi.debian.org
   debtags:
     - tate.debian.org
   dns_primary:

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

diff --git a/modules/roles/manifests/dbmaster.pp b/modules/roles/manifests/dbmaster.pp
index 1bd9d2b..f7b5a26 100644 (file)
--- a/modules/roles/manifests/dbmaster.pp
+++ b/modules/roles/manifests/dbmaster.pp
@@ -7,6 +7,7 @@
 #   include roles::dbmaster
 #
 class roles::dbmaster {
+  include apache2
 
   include roles::pubsub::parameters
 

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c8842fa..948127f 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -91,10 +91,6 @@ class roles {
                include roles::pubsub
        }
 
-       if has_role('dbmaster') {
-               include roles::dbmaster
-       }
-
        if has_role('dns_primary') {
                include roles::dns_primary
        }