Launchpad itself

Merge ~cjwatson/launchpad:charm-appserver-nrpe-reconfigure into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-appserver-nrpe-reconfigure
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 213bddf55b8586acab820f7c81877b7bda5df464
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-appserver-nrpe-reconfigure
Merge into: launchpad:master
Diff against target: 12 lines (+1/-1)
1 file modified
charm/launchpad-appserver/reactive/launchpad-appserver.py (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+444970@code.launchpad.net

Commit message

charm: Deconfigure nrpe when service is deconfigured

Description of the change

Otherwise changes to the Nagios check that we write out aren't written out when upgrading the charm.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
2index 6ba559f..6ab66c4 100644
3--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
4+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
5@@ -199,6 +199,6 @@ def nrpe_available():
6
7
8 @when("launchpad.appserver.nrpe-external-master.published")
9-@when_not("nrpe-external-master.available")
10+@when_not_all("nrpe-external-master.available", "service.configured")
11 def nrpe_unavailable():
12 clear_flag("launchpad.appserver.nrpe-external-master.published")

Subscribers

People subscribed via source and target branches

to status/vote changes: