diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-27 09:38:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-27 09:38:45 +0000 |
| commit | 42e7689e6faf485357a50470f1c83fc7b1d8c5da (patch) | |
| tree | 36e2e5ccea0e96235531b24f8933f58e272183f1 /puppet/cinder-storage-puppet.yaml | |
| parent | 2c73a7b6ac1dcb58977a2241dd29879c074ff14a (diff) | |
| parent | 1db5013abd4b9ab14b254690f2a27d7299957b75 (diff) | |
Merge "Reuse the various service passwords as db passwords."
Diffstat (limited to 'puppet/cinder-storage-puppet.yaml')
| -rw-r--r-- | puppet/cinder-storage-puppet.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index c69a0f3c..007a489c 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -16,6 +16,11 @@ parameters: default: 5000 description: The size of the loopback file used by the cinder LVM driver. type: number + CinderPassword: + default: unset + description: The password for the cinder service and db account, used by cinder-api. + type: string + hidden: true Debug: default: '' description: Set to True to enable debugging on all services. @@ -158,7 +163,7 @@ resources: config: {get_resource: BlockStorageConfig} input_values: debug: {get_param: Debug} - cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: VirtualIP} , '/cinder']]} + cinder_dsn: {list_join: ['', ['mysql://cinder:', {get_param: CinderPassword}, '@', {get_param: VirtualIP} , '/cinder']]} snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} cinder_lvm_loop_device_size: |