openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Merge mysql service_config_settings for nova"

Browse Source
This commit is contained in:
Jenkins 2017-01-05 23:51:00 +00:00 committed by Gerrit Code Review
commit 384c400d47
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
puppet/services/nova-api.yaml
View File

@ -137,15 +137,10 @@ outputs:
step_config: | step_config: |
include tripleo::profile::base::nova::api include tripleo::profile::base::nova::api
service_config_settings: service_config_settings:
keystone:
nova::keystone::auth::tenant: 'service'
nova::keystone::auth::public_url: {get_param: [EndpointMap, NovaPublic, uri]}
nova::keystone::auth::internal_url: {get_param: [EndpointMap, NovaInternal, uri]}
nova::keystone::auth::admin_url: {get_param: [EndpointMap, NovaAdmin, uri]}
nova::keystone::auth::password: {get_param: NovaPassword}
nova::keystone::auth::region: {get_param: KeystoneRegion}
mysql: mysql:
nova::db::mysql::password: {get_param: NovaPassword} map_merge:
- {get_attr: [NovaBase, role_data, service_config_settings, mysql]}
- nova::db::mysql::password: {get_param: NovaPassword}
nova::db::mysql::user: nova nova::db::mysql::user: nova
nova::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} nova::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
nova::db::mysql::dbname: nova nova::db::mysql::dbname: nova
@ -159,3 +154,10 @@ outputs:
nova::db::mysql_api::allowed_hosts: nova::db::mysql_api::allowed_hosts:
- '%' - '%'
- "%{hiera('mysql_bind_host')}" - "%{hiera('mysql_bind_host')}"
keystone:
nova::keystone::auth::tenant: 'service'
nova::keystone::auth::public_url: {get_param: [EndpointMap, NovaPublic, uri]}
nova::keystone::auth::internal_url: {get_param: [EndpointMap, NovaInternal, uri]}
nova::keystone::auth::admin_url: {get_param: [EndpointMap, NovaAdmin, uri]}
nova::keystone::auth::password: {get_param: NovaPassword}
nova::keystone::auth::region: {get_param: KeystoneRegion}