launchpad-reviewers team mailing list archive

[Colin Watson <mp+444970@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-appserver-nrpe-reconfigure into launchpad:master.

Commit message:
charm: Deconfigure nrpe when service is deconfigured

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/444970

Otherwise changes to the Nagios check that we write out aren't written out when upgrading the charm.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-appserver-nrpe-reconfigure into launchpad:master.

diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
index 6ba559f..6ab66c4 100644
--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
@@ -199,6 +199,6 @@ def nrpe_available():
 
 
 @when("launchpad.appserver.nrpe-external-master.published")
-@when_not("nrpe-external-master.available")
+@when_not_all("nrpe-external-master.available", "service.configured")
 def nrpe_unavailable():
     clear_flag("launchpad.appserver.nrpe-external-master.published")