diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-05-19 00:13:11 +0200 |
|---|---|---|
| committer |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-05-30 10:22:59 +0300 |
| commit | a6438a2082792e7528bfed682c64e352367f8f6f (patch) | |
| tree | db0e6236b5951618c20c8401bea2b7259ed2497d /puppet/services/heat-engine.yaml | |
| parent | 5090ae849b6300dba17fb55c250bc50825f7d21e (diff) | |
Pass MysqlVirtualIP via EndpointMap
By passing the MysqlVirtualIP via the EndpointMap we won't need it
to be provided as a parameter to the services.
This follows what is already happening for the glance registry
service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0.
Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff
Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Diffstat (limited to 'puppet/services/heat-engine.yaml')
| -rw-r--r-- | puppet/services/heat-engine.yaml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index 143d24bb..51807f92 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' HeatEnableDBPurge: type: boolean default: true @@ -43,19 +40,19 @@ outputs: - get_attr: [HeatBase, role_data, config_settings] - heat::engine::num_engine_workers: {get_param: HeatWorkers} tripleo::profile::base::heat::manage_db_purge: {get_param: HeatEnableDBPurge} - heat_dsn: &heat_dsn + heat::database_connection: list_join: - '' - - - 'mysql+pymysql://heat:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://heat:' - {get_param: HeatPassword} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/heat' heat::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]} heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} heat::keystone_password: {get_param: HeatPassword} - heat::database_connection: *heat_dsn heat::db::mysql::password: {get_param: HeatPassword} heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword} step_config: | |