Launchpad Mojo Specs

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

  1. Git
  2. lp:~cjwatson/launchpad-mojo-specs
  3. codeimport-bump-nrpe
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Merged at revision: 328138c8c1132112e5edde77b9a7e217b54eac87
Proposed branch: ~cjwatson/launchpad-mojo-specs:codeimport-bump-nrpe
Merge into: launchpad-mojo-specs:master
Diff against target: 46 lines (+5/-3)
3 files modified
lp-codeimport/collect-charms (+1/-1)
lp-codeimport/services (+3/-2)
lp-codeimport/upgrade-charms (+1/-0)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+404117@code.launchpad.net

Commit message

codeimport: Upgrade nrpe to revision 73

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lp-codeimport/collect-charms b/lp-codeimport/collect-charms
2index 73d44dd..f533353 100644
3--- a/lp-codeimport/collect-charms
4+++ b/lp-codeimport/collect-charms
5@@ -2,4 +2,4 @@
6 lp-codeimport git+https://git.launchpad.net/~launchpad/lp-codeimport/+git/charm-build-lp-codeimport;revno=build/84590a6865a86b49a249bc3db9e7793f556e8969
7
8 # Subordinates
9-nrpe cs:nrpe-52
10+nrpe cs:nrpe-73
11diff --git a/lp-codeimport/services b/lp-codeimport/services
12index 3cf072e..1707c1c 100644
13--- a/lp-codeimport/services
14+++ b/lp-codeimport/services
15@@ -59,6 +59,9 @@
16 {%- set log_hosts_allow = "" %}
17 {%- set nagios_context = "lp-devel-codeimport" %}
18 {%- set nagios_hostgroups = "devel-lp" %}
19+{#- The configured nagios_master doesn't have to be real, but it does have
20+ to resolve. #}
21+{%- set nagios_master = "localhost" %}
22 {%- set oops_prefix = "DEVEL" %}
23 {%- set scheduler_endpoint = "http://xmlrpc-private.launchpad.test:8087/codeimportscheduler" %}
24 {%- endif -%}
25@@ -105,9 +108,7 @@ lp-codeimport:
26 options:
27 hostgroups: "{{ nagios_hostgroups }}"
28 nagios_host_context: "{{ nagios_context }}"
29-{%- if nagios_master %}
30 export_nagios_definitions: true
31 nagios_master: "{{ nagios_master }}"
32-{%- endif %}
33 relations:
34 - ["nrpe", "lp-codeimport"]
35diff --git a/lp-codeimport/upgrade-charms b/lp-codeimport/upgrade-charms
36index ef477c7..7bdd407 100755
37--- a/lp-codeimport/upgrade-charms
38+++ b/lp-codeimport/upgrade-charms
39@@ -9,6 +9,7 @@ from utils import utils
40 juju_services = utils.juju_services()
41 app_names = [
42 'lp-codeimport',
43+ 'nrpe',
44 ]
45
46 for app_name in app_names:

Subscribers

People subscribed via source and target branches