Browse code

Merge "2.5x increase in default volume backing file size"

Jenkins authored on 2012/07/20 01:54:40
Showing 3 changed files
... ...
@@ -93,11 +93,10 @@ function init_cinder() {
93 93
         # volume group, create your own volume group called ``stack-volumes`` before
94 94
         # invoking ``stack.sh``.
95 95
         #
96
-        # By default, the backing file is 2G in size, and is stored in ``/opt/stack/data``.
96
+        # By default, the backing file is 5G in size, and is stored in ``/opt/stack/data``.
97 97
 
98 98
         if ! sudo vgs $VOLUME_GROUP; then
99 99
             VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DATA_DIR/${VOLUME_GROUP}-backing-file}
100
-            VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
101 100
             # Only create if the file doesn't already exists
102 101
             [[ -f $VOLUME_BACKING_FILE ]] || truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE
103 102
             DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`
... ...
@@ -1683,11 +1683,10 @@ elif is_service_enabled n-vol; then
1683 1683
     # volume group, create your own volume group called ``stack-volumes`` before
1684 1684
     # invoking ``stack.sh``.
1685 1685
     #
1686
-    # By default, the backing file is 2G in size, and is stored in ``/opt/stack/data``.
1686
+    # By default, the backing file is 5G in size, and is stored in ``/opt/stack/data``.
1687 1687
 
1688 1688
     if ! sudo vgs $VOLUME_GROUP; then
1689 1689
         VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DATA_DIR/${VOLUME_GROUP}-backing-file}
1690
-        VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
1691 1690
         # Only create if the file doesn't already exists
1692 1691
         [[ -f $VOLUME_BACKING_FILE ]] || truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE
1693 1692
         DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`
... ...
@@ -120,3 +120,6 @@ esac
120 120
 if [ -f $RC_DIR/localrc ]; then
121 121
     source $RC_DIR/localrc
122 122
 fi
123
+
124
+# 5Gb default volume backing file size
125
+VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-5130M}