Move db::mysql into service_config_settings
This patch movs the various db::mysql hiera settings into a 'mysql' specific service_config_settings section for each service so that these will only get applied on the MySQL service node. This follows a similar puppet-tripleo change where we create the actual databases for all services locally on the MySQL service node to avoid permission issues. Change-Id: Ic0692b1f7aa8409699630ef3924c4be98ca6ffb2 Closes-bug: #1620595 Depends-On: I05cc0afa9373429a3197c194c3e8f784ae96de5f Depends-On: I5e1ef2dc6de6f67d7c509e299855baec371f614d
This commit is contained in:
@@ -83,14 +83,7 @@ outputs:
|
||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||
- '/heat'
|
||||
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
|
||||
heat::db::mysql::password: {get_param: HeatPassword}
|
||||
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
||||
heat::db::mysql::user: heat
|
||||
heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
||||
heat::db::mysql::dbname: heat
|
||||
heat::db::mysql::allowed_hosts:
|
||||
- '%'
|
||||
- "%{hiera('mysql_bind_host')}"
|
||||
heat::engine::auth_encryption_key:
|
||||
yaql:
|
||||
expression: $.data.passwords.where($ != '').first()
|
||||
@@ -100,3 +93,13 @@ outputs:
|
||||
- {get_param: [DefaultPasswords, heat_auth_encryption_key]}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::heat::engine
|
||||
|
||||
service_config_settings:
|
||||
mysql:
|
||||
heat::db::mysql::password: {get_param: HeatPassword}
|
||||
heat::db::mysql::user: heat
|
||||
heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
||||
heat::db::mysql::dbname: heat
|
||||
heat::db::mysql::allowed_hosts:
|
||||
- '%'
|
||||
- "%{hiera('mysql_bind_host')}"
|
||||
|
||||
Reference in New Issue
Block a user