Merge "Re-mount swift disk image in start-deps"

openstack-archive · Jul 13, 2014 · 975fa34 · 975fa34
2 parents 56592dd + 4aeafc2
commit 975fa34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/scripts/redstack b/scripts/redstack
@@ -342,6 +342,12 @@ function cmd_start_deps() {
         exclaim "Reconnecting Volume Group to Backing File"
         sudo losetup -f --show ${VOLUME_BACKING_FILE}
     fi
+
+    if ! egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
+        exclaim "Re-mounting Swift Disk Image"
+        sudo mount -t xfs -o loop,noatime,nodiratime,nobarrier,logbufs=8  ${SWIFT_DISK_IMAGE} ${SWIFT_DATA_DIR}/drives/sdb1
+    fi
+
     if [[ -e $PATH_DEVSTACK_SRC/stack-screenrc ]]; then
         screen -dmS stack -c $PATH_DEVSTACK_SRC/stack-screenrc
     fi

diff --git a/scripts/redstack.rc b/scripts/redstack.rc
@@ -40,5 +40,9 @@ SERVICE_PASSWORD=7de4162d826bc5a11ad9
 # Swift hash used by devstack.
 SWIFT_HASH=12go358snjw24501
 
+# Swift Disk Image
+SWIFT_DATA_DIR=${DATA_DIR}/swift
+SWIFT_DISK_IMAGE=${SWIFT_DATA_DIR}/drives/images/swift.img
+
 DISTRO=${DISTRO:-ubuntu}
 #DISTRO=fedora