diff --git a/jenkins/scripts/bump-milestone.sh b/jenkins/scripts/bump-milestone.sh
index fd9832593a..2be8c0ffb7 100644
--- a/jenkins/scripts/bump-milestone.sh
+++ b/jenkins/scripts/bump-milestone.sh
@@ -27,7 +27,8 @@ then
     # Delete everything so the first commit is truly empty:
     git rm -rf .
     # git rm -rf leaves submodule directories:
-    find -maxdepth 1 -not -regex '\./\.git\(/.*\)?' -not -name . -exec rm -fr {} \;
+    find -maxdepth 1 -not -regex '\./\.git\(/.*\)?' -not -name . \
+        -exec rm -fr {} \;
     ls -la
 else
     git branch -D release || /bin/true
diff --git a/jenkins/scripts/create-ppa-package.sh b/jenkins/scripts/create-ppa-package.sh
index 828533c0ad..e1cfc2c80f 100755
--- a/jenkins/scripts/create-ppa-package.sh
+++ b/jenkins/scripts/create-ppa-package.sh
@@ -63,7 +63,8 @@ export DEBEMAIL="soren@openstack.org"
 
 buildno=$BUILD_NUMBER
 pkgversion="${version}-0ubuntu0~${series}${buildno}"
-dch -b --force-distribution --v "${pkgversion}" "Automated PPA build. Packaging revision: ${PACKAGING_REVNO}." -D $series
+dch -b --force-distribution --v "${pkgversion}" \
+    "Automated PPA build. Packaging revision: ${PACKAGING_REVNO}." -D $series
 dpkg-buildpackage -rfakeroot -S -sa -nc -k32EE128C
 if ! [ "$DO_UPLOAD" = "no" ]; then
     for ppa in $PPAS; do
diff --git a/jenkins/scripts/grab_console_log.sh b/jenkins/scripts/grab_console_log.sh
index 0640d9a91e..cb2af0804f 100755
--- a/jenkins/scripts/grab_console_log.sh
+++ b/jenkins/scripts/grab_console_log.sh
@@ -30,7 +30,9 @@ while ! grep -q "$END_UUID" /tmp/console.html; do
     #        fails. This allows us to retry when we have Jenkins proxy
     #        errors without polluting the output document.
     # --insecure because our Jenkins masters use self signed SSL certs.
-    curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" --fail --insecure $BUILD_URL$console_log_path >> /tmp/console.html || true
+    curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" \
+        --fail --insecure $BUILD_URL$console_log_path \
+        >> /tmp/console.html || true
 done
 
 # We need to add <pre> tags around the output for log-osanalyze to not escape
diff --git a/jenkins/scripts/jenkinsci-upload.sh b/jenkins/scripts/jenkinsci-upload.sh
index 57899cab28..6ca4460239 100644
--- a/jenkins/scripts/jenkinsci-upload.sh
+++ b/jenkins/scripts/jenkinsci-upload.sh
@@ -36,11 +36,13 @@ JENKINSCI_REPO_CREDS="/home/jenkins/.jenkinsci-curl"
 curl -X PUT \
     --config ${JENKINSCI_REPO_CREDS} \
     --data-binary @${META_DATA_FILE} \
-    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${META_DATA_FILE}" > /dev/null 2>&1
+    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${META_DATA_FILE}" \
+    > /dev/null 2>&1
 
 curl -X PUT \
     --config ${JENKINSCI_REPO_CREDS} \
     --data-binary @${PLUGIN_FILE} \
-    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${PLUGIN_FILE}" > /dev/null 2>&1
+    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${PLUGIN_FILE}" \
+    > /dev/null 2>&1
 
 exit $?
diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh
index a7a21432e7..041359c875 100755
--- a/nodepool/scripts/configure_mirror.sh
+++ b/nodepool/scripts/configure_mirror.sh
@@ -20,7 +20,8 @@ source /etc/nodepool/provider
 
 NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://pypi.$NODEPOOL_REGION.openstack.org/simple}
 
-sudo sed -i -e "s,^index-url = .*,index-url = $NODEPOOL_PYPI_MIRROR," /etc/pip.conf
+sudo sed -i -e "s,^index-url = .*,index-url = $NODEPOOL_PYPI_MIRROR," \
+    /etc/pip.conf
 
 cat >/home/jenkins/.pydistutils.cfg <<EOF
 [easy_install]
diff --git a/nodepool/scripts/convert_node_to_xenserver.sh b/nodepool/scripts/convert_node_to_xenserver.sh
index 28332c05e7..90072d1919 100755
--- a/nodepool/scripts/convert_node_to_xenserver.sh
+++ b/nodepool/scripts/convert_node_to_xenserver.sh
@@ -97,7 +97,8 @@ function main {
             download_appliance "$STAGING_APPLIANCE_URL"
             create_ramdisk_contents /root/xenserver.iso
             extract_xs_installer /root/xenserver.iso /opt/xs-install
-            generate_xs_installer_grub_config /opt/xs-install file:///tmp/ramdisk/answerfile.xml
+            generate_xs_installer_grub_config /opt/xs-install \
+                file:///tmp/ramdisk/answerfile.xml
             configure_grub
             update-grub
             create_resizing_initramfs_config
@@ -321,7 +322,8 @@ EOF
 
 function configure_grub {
     sed -ie 's/^GRUB_HIDDEN_TIMEOUT/#GRUB_HIDDEN_TIMEOUT/g' /etc/default/grub
-    sed -ie 's/^GRUB_HIDDEN_TIMEOUT_QUIET/#GRUB_HIDDEN_TIMEOUT_QUIET/g' /etc/default/grub
+    sed -ie 's/^GRUB_HIDDEN_TIMEOUT_QUIET/#GRUB_HIDDEN_TIMEOUT_QUIET/g' \
+        /etc/default/grub
     # sed -ie 's/^GRUB_TIMEOUT=.*$/GRUB_TIMEOUT=-1/g' /etc/default/grub
     sed -ie 's/^.*GRUB_TERMINAL=.*$/GRUB_TERMINAL=console/g' /etc/default/grub
     sed -ie 's/GRUB_DEFAULT=0/GRUB_DEFAULT=saved/g' /etc/default/grub
@@ -518,7 +520,8 @@ function configure_networking {
 
     # Create vifs for the appliance
     xe vif-create vm-uuid=$VM network-uuid=$HOST_INT_NET device=0
-    xe vif-create vm-uuid=$VM network-uuid=$ORIGINAL_MGT_NET mac=$MACADDRESS device=1
+    xe vif-create vm-uuid=$VM network-uuid=$ORIGINAL_MGT_NET mac=$MACADDRESS \
+        device=1
     xe vif-create vm-uuid=$VM network-uuid=$NEW_MGT_NET device=2
 
     xe vm-start uuid=$VM
@@ -536,7 +539,8 @@ function configure_networking {
         DOMID=$(xe vm-param-get param-name=dom-id uuid=$VM)
 
         # Authenticate temporary key to appliance
-        xenstore-write /local/domain/$DOMID/authorized_keys/$DOMZERO_USER "$(cat /root/dom0key.pub)"
+        xenstore-write /local/domain/$DOMID/authorized_keys/$DOMZERO_USER \
+            "$(cat /root/dom0key.pub)"
         xenstore-chmod -u /local/domain/$DOMID/authorized_keys/$DOMZERO_USER r$DOMID
 
         while ! echo "true" | bash_on_appliance; do
diff --git a/nodepool/scripts/install_devstack_dependencies.sh b/nodepool/scripts/install_devstack_dependencies.sh
index 853f37a316..a1c713e037 100755
--- a/nodepool/scripts/install_devstack_dependencies.sh
+++ b/nodepool/scripts/install_devstack_dependencies.sh
@@ -43,7 +43,8 @@ elif [ -f /usr/bin/apt-get ]; then
         sudo DEBIAN_FRONTEND=noninteractive apt-get \
             --option "Dpkg::Options::=--force-confold" \
             --assume-yes install build-essential python-dev python3-dev \
-            python-software-properties linux-headers-virtual linux-headers-$(uname -r)
+            python-software-properties linux-headers-virtual \
+            linux-headers-$(uname -r)
     fi
 else
     echo "Unsupported distro."
diff --git a/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh
index 163f06bed8..d48c5e7e9c 100755
--- a/nodepool/scripts/prepare_node_devstack.sh
+++ b/nodepool/scripts/prepare_node_devstack.sh
@@ -27,10 +27,14 @@ sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh "$HOSTNAME"
 
 # Setup venv and install deps for prepare_tempest_testrepository.py
 sudo virtualenv -p python2 /opt/git/subunit2sql-env
-sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository subunit2sql PyMySQL
+sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository \
+    subunit2sql PyMySQL
 
 # Pre-seed tempest testrepository with data from subunit2sql
-sudo -i env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
+sudo -i env PATH=/opt/git/subunit2sql-env/bin:$PATH \
+    /opt/git/subunit2sql-env/bin/python2 \
+    /opt/nodepool-scripts/prepare_tempest_testrepository.py \
+    $TEMPEST_DIR
 
 sudo chown -R jenkins:jenkins $TEMPEST_DIR/preseed-streams
 
diff --git a/nodepool/scripts/prepare_node_devstack_virt_preview.sh b/nodepool/scripts/prepare_node_devstack_virt_preview.sh
index 33902f531b..8e9dfe8d47 100755
--- a/nodepool/scripts/prepare_node_devstack_virt_preview.sh
+++ b/nodepool/scripts/prepare_node_devstack_virt_preview.sh
@@ -22,6 +22,7 @@ export SUDO='true'
 export THIN='true'
 
 ./prepare_node.sh "$HOSTNAME"
-sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_virt_preview.sh "$HOSTNAME"
+sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_virt_preview.sh \
+    "$HOSTNAME"
 
 ./restrict_memory.sh
diff --git a/nodepool/scripts/restrict_memory.sh b/nodepool/scripts/restrict_memory.sh
index b7fc5cca75..f5843b7fa0 100755
--- a/nodepool/scripts/restrict_memory.sh
+++ b/nodepool/scripts/restrict_memory.sh
@@ -19,7 +19,9 @@
 # cpu resources can be used without the risk of becoming dependent on more
 # memory.
 if [ -f /etc/default/grub ] ; then
-    sudo sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+/GRUB_TIMEOUT=0/' -e 's/#\?GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="mem=9023M /g' /etc/default/grub
+    sudo sed -i -e 's/^GRUB_TIMEOUT=[0-9]\+/GRUB_TIMEOUT=0/' \
+        -e 's/#\?GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="mem=9023M /g' \
+        /etc/default/grub
     if which update-grub &> /dev/null ; then
         sudo update-grub
     else
@@ -27,5 +29,6 @@ if [ -f /etc/default/grub ] ; then
         sudo /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
     fi
 elif [ -f /boot/grub/grub.conf ] ; then
-    sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
+    sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' \
+        -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
 fi
diff --git a/tools/build-dib-in-docker.sh b/tools/build-dib-in-docker.sh
index 861f63a116..1e0279aa68 100644
--- a/tools/build-dib-in-docker.sh
+++ b/tools/build-dib-in-docker.sh
@@ -13,4 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-docker.io run --privileged=true -v ~/.cache:/.cache -v $(git rev-parse --show-toplevel):/opt/system-config -w /opt/system-config -i -t openstack_infra/ubuntu /bin/bash tools/build-image.sh
+docker.io run --privileged=true -v ~/.cache:/.cache -v \
+    $(git rev-parse --show-toplevel):/opt/system-config \
+    -w /opt/system-config -i -t openstack_infra/ubuntu \
+    /bin/bash tools/build-image.sh
diff --git a/tools/run-bashate.sh b/tools/run-bashate.sh
index 401444be4f..6374fe9b89 100755
--- a/tools/run-bashate.sh
+++ b/tools/run-bashate.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 
 ROOT=$(readlink -fn $(dirname $0)/.. )
-find $ROOT -not -wholename \*.tox/\* -and -not -wholename \*.test/\* -and -name \*.sh -print0 | xargs -0 bashate -v
+find $ROOT -not -wholename \*.tox/\* -and -not -wholename \*.test/\* \
+    -and -name \*.sh -print0 | xargs -0 bashate -v