From 0b0849eddf0a3649abe731c0779481ad51f8c607 Mon Sep 17 00:00:00 2001 From: Seyeong Kim Date: Wed, 27 Jun 2018 15:30:15 +0900 Subject: [PATCH] Support service_domain domain when enabled v3 api Adding code for supporting service_domain domain. When keystone uses v3 api, there are service_domain, admin_domain. but now default domain is hard coded. Change-Id: I1206ba7805127f84258efceea5ec9ccb5d8abbdc --- src/templates/aodh.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/templates/aodh.conf b/src/templates/aodh.conf index 5ccfe8a..710136c 100644 --- a/src/templates/aodh.conf +++ b/src/templates/aodh.conf @@ -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 }}