labs: set errexit and no nounset for client scripts

Use bash options to have client scripts exit with an error if any
command returns an error (errexit) or if an unset variable is used
(nounset).

Fix those scripts that would otherwise fail due to this change.

Change-Id: I23336bcb5227e884eaf6dd6e9eb5cb0fc24977cc

labs/lib/functions.guest

@@ -5,6 +5,13 @@
 source "$LIB_DIR/functions"
 source "$LIB_DIR/functions-common-devstack"
 
+# Make devstack's operating system identification work with nounset
+function init_os_ident {
+    if [[ -z "${os_PACKAGE:-""}" ]]; then
+        GetOSVersion
+    fi
+}
+
 function source_deploy {
     if [ -n "${VM_SHELL_USER:-}" ]; then
         # Already sourced
@@ -281,6 +288,7 @@ function _config_interfaces_hostonly {
 function config_nat {
     local if_num=$1
 
+    init_os_ident
     if is_fedora; then
         echo _config_sysconfig_nat "$if_num"
         _config_sysconfig_nat "$if_num"
@@ -294,6 +302,7 @@ function config_hostonly {
     local if_num=$1
     local ip_address=$2
 
+    init_os_ident
     if is_fedora; then
         echo _config_sysconfig_hostonly "$if_num" "$ip_address"
         _config_sysconfig_hostonly "$if_num" "$ip_address"
@@ -317,6 +326,7 @@ function hostname_to_ip {
 }
 
 function config_network {
+    init_os_ident
     if is_ubuntu; then
         # Configuration functions will append to this file
         sudo cp -v  "$TEMPLATE_DIR/template-ubuntu-interfaces-loopback" \

labs/scripts/apt_init.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/scripts/apt_install_mysql.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/apt_pre-download.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/scripts/apt_upgrade.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"
@@ -16,6 +17,7 @@ sudo apt-get -y dist-upgrade
 
 # XXX Not a great location for Vagrant specific code
 if [[ $VM_SHELL_USER = vagrant ]]; then
+    init_os_ident
     if is_ubuntu; then
         sudo apt-get -y install virtualbox-guest-dkms
     fi

labs/scripts/config_demo_user.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/config_external_network.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/config_tenant_network.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/etc_hosts.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"

labs/scripts/install_rabbitmq.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/osbash/activate_autostart.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 # This script is the first to run and the only one to run as root.
 
 # XXX The name activate_autostart.sh is hard-coded in ks.cfg and preseed.cfg.
@@ -52,6 +53,9 @@ sed -e "
 
 chmod 755 "/etc/init.d/$RCAUTOSTART"
 
+# Make devstack's is_fedora work with nounset
+init_os_ident
+
 if is_fedora; then
     cat << SERVICE > /etc/systemd/system/$RCAUTOSTART.service
 [Unit]

labs/scripts/osbash/base_fixups.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"

labs/scripts/osbash/enable_vagrant_ssh_keys.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 
 # This script installs the unsecure Vagrant ssh keys. This allows users to
 # log into the VMs using these keys instead of a password.

labs/scripts/osbash/init_xxx_node.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 
 # This scripts configures hostname and networking for all nodes. The filename
 # determines the node name.

labs/scripts/osbash/wait_debug.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"

labs/scripts/setup_cinder_controller.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_cinder_volumes.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_glance.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_horizon.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"

labs/scripts/setup_keystone.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_neutron_compute.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_neutron_controller.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_neutron_network.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
@@ -91,7 +92,9 @@ log-queries
 # Verbose logging for DHCP
 log-dhcp
 DNSMASQ
-sudo killall dnsmasq
+
+# Catch and ignore error status if no dnsmasq process is found (the default)
+sudo killall dnsmasq||rc=$?
 
 echo "Configuring the metadata agent"
 conf=/etc/neutron/metadata_agent.ini

labs/scripts/setup_nova_compute.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/setup_nova_controller.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"

labs/scripts/shutdown.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"

labs/scripts/yum_init.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/scripts/yum_update.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/openstack"

labs/scripts/zero_empty.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -o errexit -o nounset
 TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"