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 /cinder-storage.yaml | |
parent | 2c73a7b6ac1dcb58977a2241dd29879c074ff14a (diff) | |
parent | 1db5013abd4b9ab14b254690f2a27d7299957b75 (diff) |
Merge "Reuse the various service passwords as db passwords."
Diffstat (limited to 'cinder-storage.yaml')
-rw-r--r-- | cinder-storage.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cinder-storage.yaml b/cinder-storage.yaml index 30eae1d9..aee67c9d 100644 --- a/cinder-storage.yaml +++ b/cinder-storage.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 VirtualIP: default: '' type: string @@ -146,7 +151,7 @@ resources: config: {get_resource: BlockStorageConfig} input_values: controller_virtual_ip: {get_param: VirtualIP} - 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} signal_transport: NO_SIGNAL |