Browse code

tweaks per jesse comments

Anthony Young authored on 2011/10/21 02:26:30
Showing 2 changed files
... ...
@@ -546,9 +546,9 @@ if [[ "$ENABLED_SERVICES" =~ "n-vol" ]]; then
546 546
     #
547 547
     # By default, the backing file is 2G in size, and is stored in /opt/stack.
548 548
     #
549
-    VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-/opt/stack/nova-volumes-backing-file}
550
-    VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
551 549
     if ! sudo vgdisplay | grep -q nova-volumes; then
550
+        VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-/opt/stack/nova-volumes-backing-file}
551
+        VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
552 552
         truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE
553 553
         DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`
554 554
         sudo vgcreate nova-volumes $DEV
... ...
@@ -38,7 +38,7 @@ DEST=${DEST:-/opt/stack}
38 38
 WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
39 39
 
40 40
 # Param string to pass to stack.sh.  Like "EC2_DMZ_HOST=192.168.1.1 MYSQL_USER=nova"
41
-# By default, n-vol is disabled for lxc
41
+# By default, n-vol is disabled for lxc, as iscsitarget doesn't work properly in lxc
42 42
 STACKSH_PARAMS=${STACKSH_PARAMS:-"ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit"}
43 43
 
44 44
 # Option to use the version of devstack on which we are currently working