From 450b91d5e80e2a2503fdee6208da0551069ce901 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 11 Jul 2017 11:26:23 +0100 Subject: [PATCH] Ensure metric url not set until service is fully configured --- src/reactive/gnocchi_handlers.py | 1 + unit_tests/test_gnocchi_handlers.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/reactive/gnocchi_handlers.py b/src/reactive/gnocchi_handlers.py index bad1f2f..99be819 100644 --- a/src/reactive/gnocchi_handlers.py +++ b/src/reactive/gnocchi_handlers.py @@ -76,6 +76,7 @@ def storage_ceph_disconnected(): @reactive.when('metric-service.connected') +@reactive.when('config.rendered') def provide_gnocchi_url(metric_service): with charm.provide_charm_instance() as charm_class: metric_service.set_gnocchi_url(charm_class.public_url) diff --git a/unit_tests/test_gnocchi_handlers.py b/unit_tests/test_gnocchi_handlers.py index d2f66dc..3a4fbe2 100644 --- a/unit_tests/test_gnocchi_handlers.py +++ b/unit_tests/test_gnocchi_handlers.py @@ -48,6 +48,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks): ), 'provide_gnocchi_url': ( 'metric-service.connected', + 'config.rendered', ), 'configure_ceph': ( 'storage-ceph.available',