diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-11 10:42:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-11 10:42:16 +0000 |
| commit | 866012eb9c63be119333ad2e2da268aed38b56d3 (patch) | |
| tree | d42b24655f447a76aa8a8c8c28c139eb4d4b5d0e /puppet | |
| parent | 2b2c1ded0b30907194d3e497a9654bbd40f2adba (diff) | |
| parent | 43cd92aa0abb9d7b3e9e771f0dec5775080a6d43 (diff) | |
Merge "Move heat::db data within service template"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/database.yaml | 8 | ||||
| -rw-r--r-- | puppet/services/heat-engine.yaml | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml index 471e597f..7af1ac23 100644 --- a/puppet/hieradata/database.yaml +++ b/puppet/hieradata/database.yaml @@ -21,14 +21,6 @@ neutron::db::mysql::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" -# Heat -heat::db::mysql::user: heat -heat::db::mysql::host: "%{hiera('mysql_virtual_ip')}" -heat::db::mysql::dbname: heat -heat::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" - # Ironic ironic::db::mysql::user: ironic ironic::db::mysql::host: "%{hiera('mysql_virtual_ip')}" diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index 4a5ec2c0..77af55ef 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -54,5 +54,11 @@ outputs: heat::keystone_password: {get_param: HeatPassword} 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]} + heat::db::mysql::dbname: heat + heat::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" step_config: | include ::tripleo::profile::base::heat::engine |