diskimage-builder element cleanups for dib-lint

Since I6c5a962260741dcf6f89da9a33b96372a719b7b0 dib has had a
standardised method for ensuring consistency of tracing and error
detection.  Bring the tracing for these elements up to that standard,
but maintain the status-quo of flags such as "-e" and "pipefail" by
adding ignore flags where appropriate (we can update these separately
to avoid breakage)

Other minor changes are alphabetical-ordering in the element-deps
files and permissions on prepare-node script

With this, "tox -edib" passes

Change-Id: Ibba1dadb9e819f94294c9d583b83ff698252f93f

nodepool/elements/cache-bindep/install.d/40-install-bindep

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2015 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,5 +16,11 @@
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 sudo -H virtualenv /usr/bindep-env
 sudo -H /usr/bindep-env/bin/pip install bindep

nodepool/elements/cache-bindep/install.d/50-cache-pkgs

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2011-2015 OpenStack Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 if [[ ${YUM:-yum} == "dnf" ]]; then
     echo "*** caching disabled for dnf"
     echo "*** see https://etherpad.openstack.org/p/infra-f22"

nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo

@@ -26,6 +26,10 @@
 # Most of it should be removed when we can source and call the
 # functions directly
 
+# dib-lint: disable=setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 
 GIT_BASE=${GIT_BASE:-git://git.openstack.org}

nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo

@@ -20,6 +20,10 @@
 # cache data so that the later cloning of all of the OpenStack repos
 # won't bomb out
 
+# dib-lint: disable=setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 
 sudo rm -rf $TMP_MOUNT_PATH/opt/git/openstack-dev/devstack

nodepool/elements/cache-devstack/install.d/50-download-pkgs

@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 if [[ ${YUM:-yum} == "dnf" ]]; then

nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db

@@ -15,7 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eux
+# dib-lint: disable=setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -eu
 
 TEMPEST_DIR=/opt/git/openstack/tempest
 

nodepool/elements/node-devstack/element-deps

@@ -1,3 +1,3 @@
-puppet
 cache-devstack
 nodepool-base
+puppet

nodepool/elements/node-devstack/install.d/20-prepare-node

@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 export SUDO='true'

nodepool/elements/nodepool-base/finalise.d/99-nodepool-dir

@@ -15,7 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -ex
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
 
 # Nodepool expects this dir to exist when it boots slaves.
 # Nodepool writes environment info to this dir. We set the mode

nodepool/elements/nodepool-base/finalise.d/99-restrict-memory

@@ -19,6 +19,10 @@
 # for properly handling grub. All we need to do here is get our values
 # in to the files.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 # Limit all test slaves to 8GB of memory so that larger flavors with more

nodepool/elements/nodepool-base/finalise.d/99-unbound

@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=set setu setpipefail indent
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 NODEPOOL_STATIC_NAMESERVER=${NODEPOOL_STATIC_NAMESERVER:-8.8.8.8}

nodepool/elements/nodepool-base/install.d/05-record-details

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,4 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 echo $DIB_IMAGE_NAME > /etc/image-hostname.txt

nodepool/elements/nodepool-base/install.d/50-disable-metadata-cloudinit

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2015 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +12,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 # implied.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 # Make all cloud-init data sources match rackspace- only attempt to look
 # at ConfigDrive, not at metadata service. This is not needed if there
 # is no cloud-init

nodepool/elements/nodepool-base/install.d/90-venv-swift-logs

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2015 Rackspace Australia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +12,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 # implied.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 # Create a virtualenv for zuul-swift-logs
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588

nodepool/elements/nodepool-base/install.d/91-venv-os-testr

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +12,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 # implied.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 # Create a virtualenv for os-testr (which contains subunit2html)
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588

nodepool/elements/nodepool-base/install.d/99-install-zuul

@@ -1,4 +1,4 @@
-#!/bin/bash -xe
+#!/bin/bash
 # Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,12 @@
 # This is in /usr instead of /usr/local due to this bug on precise:
 # https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -e
+
 git clone /opt/git/openstack-infra/zuul /tmp/zuul
 sudo virtualenv /usr/zuul-env
 sudo -H /usr/zuul-env/bin/pip install /tmp/zuul

nodepool/elements/openstack-repos/install.d/95-chown-jenkins

@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 chown -R jenkins:jenkins /home/jenkins

nodepool/elements/puppet/bin/prepare-node

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail dibdebugtrace indent
 set -e
 
 SUDO=${SUDO:-true}

nodepool/elements/puppet/element-deps

@@ -1,3 +1,3 @@
-source-repositories
 cache-url
 openstack-repos
+source-repositories

nodepool/elements/puppet/install.d/05-puppet

@@ -15,6 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 # Unset the download cache for this invocation to prevent bleed from build host

nodepool/elements/puppet/install.d/95-clean-repos

@@ -20,6 +20,10 @@
 # does an apt-get update to hit those servers which may not have the uptime
 # of our local mirrors.
 
+# dib-lint: disable=sete setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 OS_FAMILY=$(facter osfamily)

nodepool/elements/puppet/install.d/96-clean-cron

@@ -20,4 +20,10 @@
 # need to do things like update the locatedb or the mandb or rotate logs
 # or really any of those things. We only want code running here that we want
 # here.
+
+# dib-lint: disable=sete setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+
 rm -f /etc/cron.{monthly,weekly,daily,hourly,d}/*

nodepool/elements/puppet/pre-install.d/10-preseed

@@ -20,6 +20,10 @@
 # in a chroot, we're actually not running the right kernel for its assumptions
 # to work.
 
+# dib-lint: disable=setu setpipefail
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -e
 
 # If lsb_release is missing, just do nothing.