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/keystone.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/keystone.yaml')
| -rw-r--r-- | puppet/services/keystone.yaml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 1654f0e7..25d92d4a 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -54,9 +54,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - MysqlVirtualIPUri: - type: string - default: '' Debug: type: string default: '' @@ -97,15 +94,15 @@ outputs: description: Role data for the Keystone role. value: config_settings: - keystone_dsn: &keystone_dsn + keystone::database_connection: list_join: - '' - - - 'mysql+pymysql://keystone:' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://keystone:' - {get_param: AdminToken} - '@' - - {get_param: MysqlVirtualIPUri} + - {get_param: [EndpointMap, MysqlInternal, host]} - '/keystone' - keystone::database_connection: *keystone_dsn keystone::admin_token: {get_param: AdminToken} keystone::roles::admin::password: {get_param: AdminPassword} keystone_ca_certificate: {get_param: KeystoneCACertificate} |