Issue 122 - Puppet ENC via Hiera

modules/nagios/manifests/server.pp

Index: modules/nagios/manifests/server.pp
===================================================================
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -4,7 +4,8 @@
     $private_key,
     $is_default=false,
     $htpasswd_source,
-    $admins
+    $admins,
+    $zone,
   ) {
 
   File {
@@ -121,10 +122,9 @@
 
   Nagios_host <| |> {
     target => '/etc/nagios3/conf.d/hosts.cfg',
-    require => Package['nagios3'],
     notify => [File['/etc/nagios3/conf.d/hosts.cfg'], Service['nagios3']]
   }
-
+  <-
   Nagios_hostgroup <| |> {
     target => '/etc/nagios3/conf.d/hostgroups.cfg',
     require => Package['nagios3'],
@@ -146,4 +146,41 @@
     require => Package['nagios3'],
     notify => Service['nagios3']
   }
+
+  $nagios_contacts = hiera('nagios_contacts', {})
+  create_resources(nagios_contact, $nagios_contacts)
+
+  $nagios_contactgroups = hiera('nagios_contactgroups', {})
+  create_resources(nagios_contactgroup, $nagios_contactgroups)
+
+  $nagios_commands = hiera('nagios_commands', {})
+  create_resources(nagios_command, $nagios_commands)
+
+  $nagios_services = hiera('nagios_services', {})
+  create_resources(nagios_service, $nagios_services)
+
+  $nagios_hosts = hiera('nagios_hosts', {})
+  create_resources(nagios_host, $nagios_hosts)
+
+  $nagios_hostgroups = hiera('nagios_hostgroups', {})
+  create_resources(nagios_hostgroup, $nagios_hostgroups)
+
+  $nagios_generic = hiera('servers')
+  create_resources(nagios::server::generic_host, $nagios_generic)
+
+  define generic_host(
+    $ip,
+    $ssh_public_key = undef,
+    $role           = undef,
+    $dns            = undef,
+    $groups         = [],
+  ) {
+
+    $fqdn_name = join([$name, $nagios::server::zone], ".")

[Felix Dahlke, 2015/03/09 23:14:51]

Nit: Should be single quotes.

+
+    nagios_host {$fqdn_name:
+      use        => 'generic-host',

[Felix Dahlke, 2015/03/09 23:14:51]

While the Puppet style guide actually wants us to align arrows on column, our
style guide says something that overrules that:

"Consistency is most important: Be consistent within functions, files, modules
and projects. Making existing code conform with this style guide is fine, but it
should happen in dedicated commits, preferably for a whole module or project at
once."

So we can either do this alignment in a dedicated commit, or overrule this part
of the Puppet style guide in ours.

[mathias, 2015/03/16 12:07:11]

Since arrow alignment is prone to indentation issues after e.g. merging, and
because it naturally causes unrelated lines of code having to change sometimes,
I deeply agree with you saying that we should come clear about this once and for
all.

So either we do not use arrow alignment (in which case I'll adjust all related
files here quickly), or we use it. In the latter case, please leave the
consistency part out of this particular patch set. I am actually planning on
doing a style-update on most affected files directly after the push/merge, and
even have a lot of pending patch sets already. The only reason why they're not
in here is to minimize the changes..

+      hostgroups => $groups,
+    }
+  }
 }