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/cinder-storage.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/cinder-storage.yaml')
| -rw-r--r-- | puppet/cinder-storage.yaml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index 13914878..d760de5e 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -112,9 +112,6 @@ parameters: GlanceApiVirtualIP: type: string default: '' - MysqlVirtualIPUri: - type: string - default: '' NetworkDeploymentActions: type: comma_delimited_list description: > @@ -281,7 +278,15 @@ resources: config: {get_resource: BlockStorageConfig} input_values: debug: {get_param: Debug} - cinder_dsn: {list_join: ['', ['mysql+pymysql://cinder:', {get_param: CinderPassword}, '@', {get_param: MysqlVirtualIPUri} , '/cinder']]} + cinder_dsn: + list_join: + - '' + - - {get_param: [EndpointMap, MysqlInternal, protocol]} + - '://cinder:' + - {get_param: CinderPassword} + - '@' + - {get_param: [EndpointMap, MysqlInternal, host]} + - '/cinder' snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} cinder_lvm_loop_device_size: |