From ce5868ea130db1cb0d1890f5913e112f0da8196b Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Fri, 9 Nov 2018 09:06:17 +0100 Subject: [PATCH] Properly track required relations Add missing `juju-info` interface to squelch charm log messages. --- src/layer.yaml | 1 + src/lib/charm/openstack/barbican_vault.py | 1 + src/reactive/barbican_vault_handlers.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layer.yaml b/src/layer.yaml index db2cbea..ebe8307 100644 --- a/src/layer.yaml +++ b/src/layer.yaml @@ -1,5 +1,6 @@ includes: - layer:openstack + - interface:juju-info - interface:vault-kv - interface:barbican-secrets options: diff --git a/src/lib/charm/openstack/barbican_vault.py b/src/lib/charm/openstack/barbican_vault.py index 1e03c1b..a4f96ae 100644 --- a/src/lib/charm/openstack/barbican_vault.py +++ b/src/lib/charm/openstack/barbican_vault.py @@ -23,6 +23,7 @@ class BarbicanVaultCharm(charms_openstack.charm.OpenStackCharm): name = 'barbican-vault' packages = ['python3-castellan'] python_version = 3 + required_relations = ['secrets-storage'] adapters_class = charms_openstack.adapters.OpenStackRelationAdapters _installed_ca_name = None diff --git a/src/reactive/barbican_vault_handlers.py b/src/reactive/barbican_vault_handlers.py index e978318..dcb325f 100644 --- a/src/reactive/barbican_vault_handlers.py +++ b/src/reactive/barbican_vault_handlers.py @@ -41,7 +41,7 @@ def secret_backend_vault_request(): with charm.provide_charm_instance() as barbican_vault_charm: secrets_storage.request_secret_backend( barbican_vault_charm.secret_backend_name, isolated=False) - reactive.clear_flag('secrets-storage.connected') + barbican_vault_charm.assess_status() @reactive.when_all('endpoint.secrets.joined', 'secrets-storage.available',