openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move sahara::db data within service template 

Change-Id: Ifb87f79e8cd692e6553d03df8394c74f51821e11
This commit is contained in:
Giulio Fidente 2016-06-29 12:59:53 +02:00 committed by Emilien Macchi
parent 43cd92aa0a
commit 135fb6746d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/hieradata/database.yaml
View File

@ -52,11 +52,3 @@ aodh::db::mysql::dbname: aodh
aodh::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
sahara::db::mysql::user: sahara
sahara::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
sahara::db::mysql::dbname: sahara
sahara::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"

6
puppet/services/sahara-engine.yaml
View File

@ -37,5 +37,11 @@ outputs:
- '/sahara'
sahara::database_connection: *sahara_dsn
sahara::db::mysql::password: {get_param: SaharaPassword}
sahara::db::mysql::user: sahara
sahara::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]}
sahara::db::mysql::dbname: sahara
sahara::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
step_config: |
include ::tripleo::profile::base::sahara::engine