openstack/sunbeam-charms
Code Issues Proposed changes

Add section trustee back to heat.conf

Browse Source 
During transition to monorepo, Heat lost its trustee section, that's
needed for long running operation. For example, Magnum's use case, to
create K8S clusters needs this.

Change-Id: I1cd5066a4f2ccdf3f2a519da338e08cd7854a458
This commit is contained in:
Guillaume Boutry 2024-02-13 15:48:52 +01:00
parent 2e2dd81e7e
commit dd6000bb51
No known key found for this signature in database
GPG Key ID: E95E3326872E55DE
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charms/heat-k8s/src/templates/heat.conf.j2
View File

@ -18,6 +18,7 @@ num_engine_workers = 4
{% include "parts/section-identity" %}
{% include "parts/section-trustee" %}
[paste_deploy]
api_paste_config=/etc/heat/api-paste.ini

1
common.sh
View File

@ -215,6 +215,7 @@ CONFIG_TEMPLATES_HEAT=(
"database-connection"
"section-identity"
"identity-data"
"section-trustee"
"section-oslo-messaging-rabbit"
)

12
templates/parts/section-trustee Normal file
View File

@ -0,0 +1,12 @@
[trustee]
auth_type = password
{% if identity_service.admin_auth_url -%}
auth_url = {{ identity_service.admin_auth_url }}
{% elif identity_service.internal_auth_url -%}
auth_url = {{ identity_service.internal_auth_url }}
{% elif identity_service.internal_host -%}
auth_url = {{ identity_service.internal_protocol }}://{{ identity_service.internal_host }}:{{ identity_service.internal_port }}
{% endif -%}
username = {{ identity_service.service_user_name }}
password = {{ identity_service.service_password }}
user_domain_name = {{ identity_service.service_domain_name }}