Merge "Support service_domain domain when enabled v3 api"

This commit is contained in:
Zuul 2018-07-12 16:04:06 +00:00 committed by Gerrit Code Review
commit 3e4bf6864a
1 changed files with 9 additions and 0 deletions

View File

@ -5,6 +5,11 @@ debug = {{ options.debug }}
port = {{ options.service_listen_info.aodh_api.port }}
workers = {{ options.workers }}
gnocchi_external_project_owner = services
{% if identity_service.service_domain -%}
gnocchi_external_domain_name = {{ identity_service.service_domain }}
{% endif %}
[database]
{% if shared_db.uri -%}
connection = {{ shared_db.uri }}
@ -19,6 +24,10 @@ connection = mongodb://{{ mongodb.hostname }}:{{ mongodb.port }}/aodh
auth_type = password
region_name = {{ options.region }}
auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
{% if identity_service.service_domain -%}
project_domain_name = {{ identity_service.service_domain }}
user_domain_name = {{ identity_service.service_domain }}
{% endif -%}
project_name = {{ identity_service.service_tenant }}
username = {{ identity_service.service_username }}
password = {{ identity_service.service_password }}