Merge ~cjwatson/launchpad-mojo-specs:codeimport-bump-nrpe into launchpad-mojo-specs:master

[Colin Watson]

codeimport: Upgrade nrpe to revision 73

We have to set nagios_master everywhere now, otherwise the charm considers itself to be blocked.

[Ioana Lasc (ilasc)]

review: Approve

diff --git a/lp-codeimport/collect-charms b/lp-codeimport/collect-charms
index 73d44dd..f533353 100644
--- a/lp-codeimport/collect-charms
+++ b/lp-codeimport/collect-charms
@@ -2,4 +2,4 @@
 lp-codeimport			git+https://git.launchpad.net/~launchpad/lp-codeimport/+git/charm-build-lp-codeimport;revno=build/84590a6865a86b49a249bc3db9e7793f556e8969
 
 # Subordinates
-nrpe				cs:nrpe-52
+nrpe				cs:nrpe-73
diff --git a/lp-codeimport/services b/lp-codeimport/services
index 3cf072e..1707c1c 100644
--- a/lp-codeimport/services
+++ b/lp-codeimport/services
@@ -59,6 +59,9 @@
 {%-   set log_hosts_allow = "" %}
 {%-   set nagios_context = "lp-devel-codeimport" %}
 {%-   set nagios_hostgroups = "devel-lp" %}
+{#-   The configured nagios_master doesn't have to be real, but it does have
+      to resolve. #}
+{%-   set nagios_master = "localhost" %}
 {%-   set oops_prefix = "DEVEL" %}
 {%-   set scheduler_endpoint = "http://xmlrpc-private.launchpad.test:8087/codeimportscheduler" %}
 {%- endif -%}
@@ -105,9 +108,7 @@ lp-codeimport:
       options:
         hostgroups: "{{ nagios_hostgroups }}"
         nagios_host_context: "{{ nagios_context }}"
-{%- if nagios_master %}
         export_nagios_definitions: true
         nagios_master: "{{ nagios_master }}"
-{%- endif %}
   relations:
     - ["nrpe", "lp-codeimport"]
diff --git a/lp-codeimport/upgrade-charms b/lp-codeimport/upgrade-charms
index ef477c7..7bdd407 100755
--- a/lp-codeimport/upgrade-charms
+++ b/lp-codeimport/upgrade-charms
@@ -9,6 +9,7 @@ from utils import utils
 juju_services = utils.juju_services()
 app_names = [
     'lp-codeimport',
+    'nrpe',
     ]
 
 for app_name in app_names: