openstack/tripleo-heat-templates
Code Issues Proposed changes

Aodh: define authtoken parameters in AodhApi service

Browse Source 
... because these parameters are used in aodh-api service only.

Change-Id: I0bd6da56605d2699f1bcda5ea24848296b380d25
This commit is contained in:
Takashi Kajinami 2021-04-21 23:00:35 +09:00
parent 0dc522bbc7
commit 23434faf92
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/aodh/aodh-api-container-puppet.yaml
View File

@ -166,6 +166,14 @@ outputs:
aodh::api::service_name: 'httpd' aodh::api::service_name: 'httpd'
aodh::api::enable_proxy_headers_parsing: true aodh::api::enable_proxy_headers_parsing: true
aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject} aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject}
aodh::keystone::authtoken::project_name: 'service'
aodh::keystone::authtoken::user_domain_name: 'Default'
aodh::keystone::authtoken::project_domain_name: 'Default'
aodh::keystone::authtoken::password: {get_param: AodhPassword}
aodh::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::keystone::authtoken::region_name: {get_param: KeystoneRegion}
aodh::keystone::authtoken::interface: 'internal'
aodh::policy::policies: {get_param: AodhApiPolicies} aodh::policy::policies: {get_param: AodhApiPolicies}
# NOTE: bind IP is found in hiera replacing the network name with the # NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples # local node IP for the given network; replacement examples

8
deployment/aodh/aodh-base.yaml
View File

@ -89,14 +89,6 @@ outputs:
- {get_param: Debug} - {get_param: Debug}
aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::notification_driver: {get_param: NotificationDriver} aodh::notification_driver: {get_param: NotificationDriver}
aodh::keystone::authtoken::project_name: 'service'
aodh::keystone::authtoken::user_domain_name: 'Default'
aodh::keystone::authtoken::project_domain_name: 'Default'
aodh::keystone::authtoken::password: {get_param: AodhPassword}
aodh::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
aodh::keystone::authtoken::region_name: {get_param: KeystoneRegion}
aodh::keystone::authtoken::interface: 'internal'
aodh::auth::auth_password: {get_param: AodhPassword} aodh::auth::auth_password: {get_param: AodhPassword}
aodh::auth::auth_region: {get_param: KeystoneRegion} aodh::auth::auth_region: {get_param: KeystoneRegion}
aodh::auth::auth_project_name: 'service' aodh::auth::auth_project_name: 'service'