Sync with charm-helpers
This sync includes this patch to charm helpers: https://github.com/juju/charm-helpers/pull/757 which is an extension of this one: https://github.com/juju/charm-helpers/pull/740 and both are meant to include templates to configure service tokens in juju charms as shown in this lp bug: Related-Bug: #1992840 Change-Id: I5a5564f3e50fc09dc905b6a8f49256886d3c6a69
This commit is contained in:
parent
dc7ecbc6ec
commit
cc5d6234c7
|
@ -127,7 +127,9 @@ def deferred_events():
|
|||
"""
|
||||
events = []
|
||||
for defer_file in deferred_events_files():
|
||||
events.append((defer_file, read_event_file(defer_file)))
|
||||
event = read_event_file(defer_file)
|
||||
if event.policy_requestor_name == hookenv.service_name():
|
||||
events.append((defer_file, event))
|
||||
return events
|
||||
|
||||
|
||||
|
|
|
@ -22,4 +22,6 @@ signing_dir = {{ signing_dir }}
|
|||
{% if use_memcache == true %}
|
||||
memcached_servers = {{ memcache_url }}
|
||||
{% endif -%}
|
||||
service_token_roles = {{ admin_role }}
|
||||
service_token_roles_required = True
|
||||
{% endif -%}
|
||||
|
|
Loading…
Reference in New Issue