openstack/charm-cinder
Code Issues Proposed changes

Sync with charm-helpers

Browse Source 
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: Ib273f50d620160f62cbb3d6f5789bf334a7d6333
This commit is contained in:
Jorge Merlino
2023-03-31 11:59:28 -03:00
parent 05a28c19c7
commit 739aed0a14
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
charmhelpers/contrib/openstack/deferred_events.py
View File

@@ -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

2
charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka
View File

@@ -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 -%}