Merge ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:reconfigure-on-configchanged into ~canonical-bootstack/charm-openstack-service-checks:master

Proposed by Xav Paice
Status: Merged
Approved by: Wouter van Bommel
Approved revision: b8a612a1492932341042a572051a437202eeb78f
Merged at revision: 869d5d5432e3baa5f9baa54ee716ecc1aff8e3ef
Proposed branch: ~xavpaice/charm-openstack-service-checks/+git/charm-openstack-service-checks:reconfigure-on-configchanged
Merge into: ~canonical-bootstack/charm-openstack-service-checks:master
Diff against target: 16 lines (+5/-0)
1 file modified
reactive/openstack_service_checks.py (+5/-0)
Reviewer Review Type Date Requested Status
Wouter van Bommel (community) Approve
Review via email: mp+367178@code.launchpad.net

Commit message

Add config-changed

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Andrea Ieri (aieri) wrote :
Revision history for this message
Xav Paice (xavpaice) wrote :

We need to clear the .configured flag in order to trigger regeneration of the checks, and nothing in the other two changes does that, so I think that they don't actually overlap.

Revision history for this message
Wouter van Bommel (woutervb) wrote :

Makes sence

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 869d5d5432e3baa5f9baa54ee716ecc1aff8e3ef

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/openstack_service_checks.py b/reactive/openstack_service_checks.py
2index c122bf1..6a0d842 100644
3--- a/reactive/openstack_service_checks.py
4+++ b/reactive/openstack_service_checks.py
5@@ -31,6 +31,11 @@ CERT_FILE = '/usr/local/share/ca-certificates/openstack-service-checks.crt'
6 helper = OSCHelper()
7
8
9+@when('config.changed')
10+def config_changed():
11+ clear_flag('openstack-service-checks.configured')
12+
13+
14 @when_not('openstack-service-checks.installed')
15 @when('nrpe-external-master.available')
16 def install_openstack_service_checks():

Subscribers

People subscribed via source and target branches