From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 15:52:54 +0000 (+0200)
Subject: split includes out of base class so things are included a bit later and things like... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=54f4fb7090eec6ba410a5931777b3557508bf7d2;p=mirror%2Fdsa-puppet.git

split includes out of base class so things are included a bit later and things like classes.include?("puppetmaster") work
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a26ef03a5..12798e573 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -375,4 +375,4 @@ roles:
     - cgi-grnet-01.debian.org
 
 classes:
-  - base
+  - base::includes
diff --git a/modules/base/manifests/includes.pp b/modules/base/manifests/includes.pp
new file mode 100644
index 000000000..d87354423
--- /dev/null
+++ b/modules/base/manifests/includes.pp
@@ -0,0 +1,27 @@
+class base::includes {
+  include munin
+  include syslog_ng
+  include sudo
+  include ssh
+  include debian_org
+  include monit
+  include time
+  include ssl
+  include hardware
+  include nagios::client
+  include resolv
+  include roles
+  include motd
+  include unbound
+  include bacula::client
+  include autofs
+  include grub
+  include multipath
+  include popcon
+  include portforwarder
+  include postgres
+  include haveged
+  include huge_mem
+  include tcp_bbr
+  include certregen::client
+}
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 413c66785..bda0d7f30 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -3,30 +3,4 @@ class base(
   Optional[Stdlib::IP::Address] $public_address6 = filter_ipv6(getfromhash($site::nodeinfo, 'ldap', 'ipHostNumber'))[0],
 ) {
   $public_addresses = [ $public_address, $public_address6 ]
-
-    include munin
-    include syslog_ng
-    include sudo
-    include ssh
-    include debian_org
-    include monit
-    include time
-    include ssl
-    include hardware
-    include nagios::client
-    include resolv
-    include roles
-    include motd
-    include unbound
-    include bacula::client
-    include autofs
-    include grub
-    include multipath
-    include popcon
-    include portforwarder
-    include postgres
-    include haveged
-    include huge_mem
-    include tcp_bbr
-    include certregen::client
 }