From 5f25e6e23fc7a0f900ef5c32d066f91c82b9cfdb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 29 Aug 2019 17:35:10 +0200 Subject: [PATCH] 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. --- hieradata/common.yaml | 3 +++ manifests/site.pp | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 97c06e3a7..e086c4b10 100644 --- 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 b735738c2..88f565d95 100644 --- 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 -- 2.20.1