diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-07 13:11:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-07 13:11:17 +0000 |
| commit | 7773f25759867a8807be21f9df1e58aaf8328e26 (patch) | |
| tree | a726187ed24dcddad3814f7cb3d6b1e74802d2e1 | |
| parent | 3ea6b2cbe1ee70d60fa1ebcbf084b390aab8266c (diff) | |
| parent | d6b5b1d869739aefd7357a266566d1b3d0ecf09c (diff) | |
Merge "Make size of loop device used by cinder LVM configurable"
| -rw-r--r-- | block-storage.yaml | 6 | ||||
| -rw-r--r-- | overcloud-source.yaml | 7 | ||||
| -rw-r--r-- | undercloud-source.yaml | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index ce60ce26..9cc92fe1 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -40,7 +40,8 @@ Resources: host: {get_input: controller_host} cinder: db: {get_input: cinder_dsn} - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: @@ -64,7 +65,8 @@ Resources: host: {get_input: controller_host} cinder: db: {get_input: cinder_dsn} - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 6949deaa..a1079b85 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -21,6 +21,10 @@ Parameters: Default: tgtadm Description: The iSCSI helper to use with cinder. Type: String + CinderLVMLoopDeviceSize: + Default: 5000 + Description: The size of the loopback file used by the cinder LVM driver. + Type: Number ExtraConfig: Default: {} Description: | @@ -329,7 +333,8 @@ Resources: Ref: NeutronPublicInterfaceIP cinder: db: mysql://cinder:unset@localhost/cinder - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize service-password: Ref: CinderPassword iscsi-helper: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 9eaa8786..53567ba9 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -11,6 +11,10 @@ Parameters: Description: The keystone auth secret. Type: String NoEcho: true + CinderLVMLoopDeviceSize: + Default: 5000 + Description: The size of the loopback file used by the cinder LVM driver. + Type: Number BaremetalArch: Default: i386 Description: The architecture to use in Nova-BM - i386 or amd64. @@ -153,7 +157,8 @@ Resources: Ref: CeilometerPassword cinder: db: mysql://cinder:unset@localhost/cinder - volume_size_mb: '5000' + volume_size_mb: + Ref: CinderLVMLoopDeviceSize completion-handle: Ref: controller0CompletionHandle db-password: unset |