Include hiera classes

We want to be able to specify which puppet classes a node should include
using hiera.  Start by including hiera classes in the site manifest,
and move the site class so we include something using this mechanism.

Eventually we want to move all the include entries out of manifests/site.pp.

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 97c06e3..e086c4b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -378,3 +378,6 @@ roles:
     - loghost-grnet-01.debian.org
     - loghost-osuosl-01.debian.org
     - lotti.debian.org
+
+classes:
+  - site

diff --git a/manifests/site.pp b/manifests/site.pp
index b735738..88f565d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,10 @@ Service {
 }
 
 node default {
-       include site
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
+
        include munin
        include syslog_ng
        include sudo