Merge ~brad-marshall/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:fix-prometheus-target-relation into ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master

[Brad Marshall]

Fixed prometheus target relation

[James Hebden (ec0)]

LGTM

review: Approve

diff --git a/reactive/prometheus-ceph-exporter.py b/reactive/prometheus-ceph-exporter.py
index 41e9e69..9d6fb73 100644
--- a/reactive/prometheus-ceph-exporter.py
+++ b/reactive/prometheus-ceph-exporter.py
@@ -18,7 +18,7 @@ import os
 from charmhelpers.core import host, hookenv
 from charmhelpers.core.templating import render
 from charms.reactive import (
-    when, when_not, set_state, remove_state
+    when, when_any, set_state, remove_state
 )
 from charms.reactive.helpers import any_file_changed, data_changed
 # from charms.layer import snap
@@ -41,8 +41,8 @@ def validate_config(filename):
     return yaml.safe_load(open(filename))
 
 
-@when('snap.installed.prometheus-ceph-exporter')
-@when('ceph-exporter.do-reconfig-yaml')
+@when_any('snap.installed.prometheus-ceph-exporter',
+          'ceph-exporter.do-reconfig-yaml')
 def write_ceph_exporter_config_yaml():
     # config = hookenv.config()
     hookenv.open_port(PORT_DEF)