Merge branch 'master' of https://github.com/openstack-dev/devstack

6 files changed, 13 insertions, 14 deletions

diff --git a/lib/swift b/lib/swift
index 54d6f1c..28ca8a8 100644
--- a/lib/swift
+++ b/lib/swift
@@ -657,10 +657,8 @@ function stop_swift() {
     if type -p swift-init >/dev/null; then
         swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
     fi
-    for type in proxy object container account; do
-        # Dump all of the servers
-        pkill -f swift-
-    done
+    # Dump all of the servers
+    pkill -f swift-
 }
 
 # Restore xtrace
diff --git a/stackrc b/stackrc
index e89d25e..7eed60c 100644
--- a/stackrc
+++ b/stackrc
@@ -171,7 +171,7 @@ REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-master}
 # storage service
 SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git}
 SWIFT_BRANCH=${SWIFT_BRANCH:-master}
-SWIFT3_REPO=${SWIFT3_REPO:-${GIT_BASE}/fujita/swift3.git}
+SWIFT3_REPO=${SWIFT3_REPO:-http://github.com/fujita/swift3.git}
 SWIFT3_BRANCH=${SWIFT3_BRANCH:-master}
 
 # python swift client library
diff --git a/tools/bash8.py b/tools/bash8.py
index 9fb51ec..7552e0d 100755
--- a/tools/bash8.py
+++ b/tools/bash8.py
@@ -47,7 +47,7 @@ IGNORE = None
 def register_ignores(ignores):
     global IGNORE
     if ignores:
-        IGNORE='^(' + '|'.join(ignores.split(',')) + ')'
+        IGNORE = '^(' + '|'.join(ignores.split(',')) + ')'
 
 
 def should_ignore(error):
@@ -64,11 +64,15 @@ def print_error(error, line):
 def not_continuation(line):
     return not re.search('\\\\$', line)
 
+
 def check_for_do(line):
     if not_continuation(line):
-        if re.search('^\s*for ', line):
+        match = re.match('^\s*(for|while|until)\s', line)
+        if match:
+            operator = match.group(1).strip()
             if not re.search(';\s*do(\b|$)', line):
-                print_error('E010: Do not on same line as for', line)
+                print_error('E010: Do not on same line as %s' % operator,
+                            line)
 
 
 def check_if_then(line):
diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
index 5f4c486..e2d855c 100755
--- a/tools/create_userrc.sh
+++ b/tools/create_userrc.sh
@@ -71,8 +71,7 @@ MODE=""
 ROLE=Member
 USER_NAME=""
 USER_PASS=""
-while [ $# -gt 0 ]
-do
+while [ $# -gt 0 ]; do
     case "$1" in
     -h|--help) display_help; exit 0 ;;
     --os-username) export OS_USERNAME=$2; shift ;;
diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index d172c7b..d0d81a2 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -191,8 +191,7 @@ function wait_for_VM_to_halt() {
     domid=$(xe vm-list name-label="$GUEST_NAME" params=dom-id minimal=true)
     port=$(xenstore-read /local/domain/$domid/console/vnc-port)
     echo "vncviewer -via root@$mgmt_ip localhost:${port:2}"
-    while true
-    do
+    while true; do
         state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted)
         if [ -n "$state" ]; then
             break
diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh
index 8412fdc..b9b65fd 100755
--- a/tools/xen/scripts/install-os-vpx.sh
+++ b/tools/xen/scripts/install-os-vpx.sh
@@ -42,8 +42,7 @@ EOF
 
 get_params()
 {
-    while getopts "hbn:r:l:t:" OPTION;
-    do
+    while getopts "hbn:r:l:t:" OPTION; do
         case $OPTION in
             h) usage
                 exit 1