Merge remote-tracking branch 'varac/5998_fix_nagios_nodename' into 0.5.3

puppet/modules/site_nagios/manifests/add_service.pp

 define site_nagios::add_service (
   $hostname, $ip_address, $openvpn_gw = '', $service) {
 
+  $ssh      = hiera_hash('ssh')
+  $ssh_port = $ssh['port']
+
   case $service {
     'webapp': {
       nagios_service {
+        "${name}_ssh":
+          use                 => 'generic-service',
+          check_command       => "check_ssh_port!$ssh_port",
+          service_description => 'SSH',
+          host_name           => $hostname;
         "${name}_cert":
           use                 => 'generic-service',
           check_command       => 'check_https_cert',

puppet/modules/site_sshd/manifests/init.pp

@@ -52,7 +52,7 @@ class site_sshd {
   ## SSHD SERVER CONFIGURATION
   ##
   class { '::sshd':
-    manage_nagios => 'no',
+    manage_nagios => false,
     ports         => $ssh['port'],
     use_pam       => 'yes',
     hardened_ssl  => 'yes',