Merge "Fix dib-lint failures"

elements/check_mk-agent/install.d/99-check_mk_local_checks

@@ -7,17 +7,17 @@ set -o pipefail
 
 
 if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
-  # we're running a RHEL-based distro, so we need to install to
-  # /usr/share/check-mk-agent/local
-  LOCAL_CHECK_ROOT=/usr/share/check-mk-agent/local
+    # we're running a RHEL-based distro, so we need to install to
+    # /usr/share/check-mk-agent/local
+    LOCAL_CHECK_ROOT=/usr/share/check-mk-agent/local
 else
-  # We're running a debian-based distro so we need to install
-  # to /usr/lib/check_mk_agent/local/
-  LOCAL_CHECK_ROOT=/usr/lib/check_mk_agent/local
+    # We're running a debian-based distro so we need to install
+    # to /usr/lib/check_mk_agent/local/
+    LOCAL_CHECK_ROOT=/usr/lib/check_mk_agent/local
 fi
 mkdir -p $LOCAL_CHECK_ROOT
 
 LOCAL_CHECK_SOURCE=$(dirname $0)/../check_mk_checks
 if [[ -d "${LOCAL_CHECK_SOURCE}" ]]; then
-  install -m 0755 -o root -g root  $LOCAL_CHECK_SOURCE/* $LOCAL_CHECK_ROOT/
+    install -m 0755 -o root -g root  $LOCAL_CHECK_SOURCE/* $LOCAL_CHECK_ROOT/
 fi

elements/cinder/pre-install.d/00-cinder-disable-requiretty

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 
 if [ -d /etc/sudoers.d ]; then
     echo "Defaults:cinder !requiretty" > /etc/sudoers.d/cinder-notty

elements/devstack/block-device-size.d/10-size

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Enforce a maximum size on the image size
 
-set -e
+set -eu
 
 if (( '16' '>' $DIB_IMAGE_SIZE )); then
     echo DIB_IMAGE_SIZE=16

elements/devstack/install.d/52-image-toolchain

@@ -3,7 +3,7 @@
 # (also includes the bootstrap-from-devstack facilities needed until we have
 # full image mastering of openstack).
 
-set -e
+set -eu
 set -o xtrace
 
 install-packages git

elements/devstack/install.d/53-devstack

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Initialize devstack in the bootstrap image
 
-set -e
+set -eu
 set -o xtrace
 
 install-packages git

elements/devstack/install.d/97-haveged

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Install the haveged daemon so ssh config on startup isn't glacial.
 
-set -e
+set -eu
 set -o xtrace
 
 install-packages haveged

elements/devstack/install.d/98-baremetal-network

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Configure eth1, the baremetal network.
 
-set -e
+set -eu
 set -o xtrace
 
 cat << EOF >> /etc/network/interfaces

elements/devstack/install.d/99-ssh

@@ -2,7 +2,7 @@
 # Regenerate host keys now. XXX: Really should be a cloud-init task, should get
 # that working.
 
-set -e
+set -eu
 set -o xtrace
 
 dpkg-reconfigure openssh-server

elements/heat-cfntools/install.d/05-heat-cfntools

@@ -5,8 +5,8 @@ set -uex
 install-packages python-psutil gcc python-dev
 
 if [[ "fedora" = "$DISTRO_NAME" ]]; then
-  # Remove the pre-installed package version of heat-cfntools
-  yum remove -y heat-cfntools
+    # Remove the pre-installed package version of heat-cfntools
+    yum remove -y heat-cfntools
 fi
 
 VENV=/opt/stack/venvs/heat-cfntools

elements/heat-engine/install.d/heat-source-install/10-heat-engine

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 
 install-packages python-mysqldb
 

elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 os-svc-enable -n heat-engine
 

elements/heat/install.d/heat-source-install/05-heat

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 install-packages python-setuptools python-eventlet python-greenlet \
     python-httplib2 python-iso8601 python-lxml python-sqlalchemy \
     python-paste python-routes python-webob python-yaml libffi-dev

elements/ironic/pre-install.d/00-ironic-disable-requiretty

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -eu
 
 if [ -d /etc/sudoers.d ]; then
     echo "Defaults:ironic !requiretty" > /etc/sudoers.d/ironic-notty

elements/jenkins/install.d/10-jenkins

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 set -o xtrace
 
 install-packages jenkins

elements/jenkins/install.d/11-jenkins-plugins

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 set -o xtrace
 
 source $(dirname $0)/defaults

elements/jenkins/pre-install.d/10-jenkins

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Add the Jenkins package archive
 
-set -e
+set -eu
 set -o xtrace
 
 wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add -

elements/nova-compute/install.d/nova-source-install/80-nova-compute

@@ -10,7 +10,7 @@ CONFIG_PARAMETERS="--config-dir /etc/nova"
 TEMPLATE_ROOT=$(dirname $0)/../os-apply-config
 
 if [ -d ${TEMPLATE_ROOT}/etc/nova/compute ]; then
-  CONFIG_PARAMETERS="${CONFIG_PARAMETERS} --config-dir /etc/nova/compute"
+    CONFIG_PARAMETERS="${CONFIG_PARAMETERS} --config-dir /etc/nova/compute"
 fi
 
 os-svc-daemon -i "$NOVA_VENV_DIR" -e "LIBVIRT_DEFAULT_URI=qemu:///system" nova-compute  nova nova-compute "${CONFIG_PARAMETERS}"

elements/pypi-mirror/install.d/50-pypi-mirror

@@ -6,7 +6,7 @@
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

elements/stackuser/install.d/50-user

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Add the stack user we recommend folk use.
 
-set -e
+set -eu
 set -o xtrace
 
 useradd -m stack -s /bin/bash

elements/tempest/tests2skip.py

@@ -7,7 +7,7 @@
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
@@ -37,14 +37,14 @@ so the regular expression should account for that.
 
 For example, the following scenario:
 
-  run all the smoke tests and scenario tests,
-  but exclude the api.volume tests.
+    run all the smoke tests and scenario tests,
+    but exclude the api.volume tests.
 
 is implemented as:
 
-  +.*smoke
-  +tempest\.scenario
-  -tempest\.api\.volume.*
+    +.*smoke
+    +tempest\.scenario
+    -tempest\.api\.volume.*
 """
 
 whitelist = []

elements/tripleo-staging/pre-install.d/01-bleeding-edge

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Install bleeding edge tools instead of stable ones.
 
-set -e
+set -eu
 
 add-apt-repository -y ppa:tripleo/demo-staging