commit 20435d7de4b2157c241660f4aee821970c8b57a7
author Jenkins <jenkins@review.openstack.org> Fri Jul 20 18:16:04 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jul 20 18:16:04 2012 +0000
tree de24c6e47fe23b7447c57779fec6de0cd4b18ef0
parent f4d5780d644d7107c5e47969b02d5085f67aab95
parent 91b0acdefff432edf0021b00fe535637ecb8d789

Merge "Allow wget to handle Non-English output"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 5b38719..119cc91 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -93,11 +93,10 @@
         # volume group, create your own volume group called ``stack-volumes`` before
         # invoking ``stack.sh``.
         #
-        # By default, the backing file is 2G in size, and is stored in ``/opt/stack/data``.
+        # By default, the backing file is 5G in size, and is stored in ``/opt/stack/data``.
 
         if ! sudo vgs $VOLUME_GROUP; then
             VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DATA_DIR/${VOLUME_GROUP}-backing-file}
-            VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
             # Only create if the file doesn't already exists
             [[ -f $VOLUME_BACKING_FILE ]] || truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE
             DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`

stack.sh

diff --git a/stack.sh b/stack.sh
index 98af10a..75923a3 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1683,11 +1683,10 @@
     # volume group, create your own volume group called ``stack-volumes`` before
     # invoking ``stack.sh``.
     #
-    # By default, the backing file is 2G in size, and is stored in ``/opt/stack/data``.
+    # By default, the backing file is 5G in size, and is stored in ``/opt/stack/data``.
 
     if ! sudo vgs $VOLUME_GROUP; then
         VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DATA_DIR/${VOLUME_GROUP}-backing-file}
-        VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}
         # Only create if the file doesn't already exists
         [[ -f $VOLUME_BACKING_FILE ]] || truncate -s $VOLUME_BACKING_FILE_SIZE $VOLUME_BACKING_FILE
         DEV=`sudo losetup -f --show $VOLUME_BACKING_FILE`

stackrc

diff --git a/stackrc b/stackrc
index 3a19cdb..badde68 100644
--- a/stackrc
+++ b/stackrc
@@ -120,3 +120,6 @@
 if [ -f $RC_DIR/localrc ]; then
     source $RC_DIR/localrc
 fi
+
+# 5Gb default volume backing file size
+VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-5130M}

unstack.sh

diff --git a/unstack.sh b/unstack.sh
index 641d34e..6a55a0a 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -63,3 +63,8 @@
         stop_service mysql
     fi
 fi
+
+# Quantum dhcp agent runs dnsmasq
+if is_service_enabled q-dhcp; then
+    sudo kill -9 $(ps aux | awk '/[d]nsmasq.+interface=tap/ { print $2 }')
+fi