aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Thomas <duncan.thomas@hp.com>2014-04-17 13:28:05 -0400
committerDuncan Thomas <duncan.thomas@hp.com>2014-04-25 13:19:52 +0100
commitd6b5b1d869739aefd7357a266566d1b3d0ecf09c (patch)
treed4e62b1819a896a4fbd7a1da8fefa908910fc6ab
parent439825b1b079d7bbf7f65f9c85f3adbed9ec204a (diff)
Make size of loop device used by cinder LVM configurable
This was hard-coded to 5 gig, which is useless for anything other than tempest runs and smoke testing block-storage-nfs.yaml has intentionally not been changed, since volume_size_mb is not used in that setup. Cleaning up that code will be done separately. Change-Id: I476b906a8d439d3e6643dd0c214965c5862418e8
-rw-r--r--block-storage.yaml6
-rw-r--r--overcloud-source.yaml7
-rw-r--r--undercloud-source.yaml7
3 files changed, 16 insertions, 4 deletions
diff --git a/block-storage.yaml b/block-storage.yaml
index ce60ce2..9cc92fe 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 ecdf05c..8d2d5dd 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: |
@@ -310,7 +314,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 9eaa878..53567ba 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