Merge lp:~bloodearnest/charms/trusty/conn-check/nagios-module-typo-fixes into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

[Simon Davy]

Fixes for the new nrpe role

Fixes for the new nrpe role

[Wes Mason (wesmason)]

review: Approve

=== modified file 'playbook.yaml'
--- playbook.yaml	2015-07-20 12:57:03 +0000
+++ playbook.yaml	2015-07-20 18:54:01 +0000
@@ -16,8 +16,7 @@
 
   roles:
    - role: nrpe-external-master
-     # use hostname for principle charm
-     nagios_hostname: "{{ relations['conn-check'][0]['__unit__']|replace('/', '=') }}"
+     nagios_hostname: "{{ relations['conn-check'][0]['__unit__']|replace('/', '-') }}"
      checks:
         - name: click_updown_conn_check
           command: "{{ env_dir }}/{{ revision }}/bin/conn-check --exclude-tags=no-nagios {{ args }} {{ config_path }}"
 
=== modified file 'roles/nrpe-external-master/defaults/main.yaml'
--- roles/nrpe-external-master/defaults/main.yaml	2015-07-20 12:57:03 +0000
+++ roles/nrpe-external-master/defaults/main.yaml	2015-07-20 18:54:01 +0000
@@ -1,3 +1,3 @@
 nagios_context: "{{ relations['nrpe-external-master'][0].nagios_host_context }}"
-nagios_hostname: "{{ local_unit|replace('/', '-')) }}"
+nagios_hostname: "{{ local_unit|replace('/', '-') }}"
 nagios_servicegroups: "{{ nagios_context }}"
 
=== modified file 'roles/nrpe-external-master/library/nrpe'
--- roles/nrpe-external-master/library/nrpe	2015-07-20 12:57:03 +0000
+++ roles/nrpe-external-master/library/nrpe	2015-07-20 18:54:01 +0000
@@ -22,8 +22,8 @@
     # NRPE is hardcoded to pick up nagios_context from the charm config
     charm_config = config()
     charm_config["nagios_context"] = params['nagios_context']
-    charm_config["nagios_servicegroups"] = params['servicegroups']
-    hostname = "{}-{}".format(params['nagios_context'], params['hostname'])
+    charm_config["nagios_servicegroups"] = params['nagios_servicegroups']
+    hostname = "{}-{}".format(params['nagios_context'], params['nagios_hostname'])
 
     try:
         nrpe_compat = NRPE(hostname)
@@ -34,7 +34,8 @@
         )
         nrpe_compat.write()
     except Exception as e:
-        module.fail_json(msg=e.msg)
+        import traceback
+        module.fail_json(msg=e.message, traceback=traceback.format_exc())
     else:
         module.exit_json(changed=True)