Merge "labs: make TOP_DIR more robust with blanks in path"

labs/osbash.sh

@@ -6,7 +6,7 @@ set -o nounset
 # Kill entire process group
 trap 'kill -- -$$' SIGINT
 
-TOP_DIR=$(cd $(dirname "$0") && pwd)
+TOP_DIR=$(cd "$(dirname "$0")" && pwd)
 
 : ${DISTRO:=ubuntu-14.04-server-amd64}
 

labs/scripts/config_external_network.sh

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

labs/scripts/config_tenant_network.sh

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

labs/scripts/etc_hosts.sh

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

labs/scripts/osbash/activate_autostart.sh

@@ -7,7 +7,7 @@ set -o errexit -o nounset
 # Remove files that called us (written by {ks,preseed}.cfg)
 rm -f /etc/init.d/osbash /etc/rc2.d/S40osbash
 
-TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
+TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 # source_deploy doesn't work here
 source "$CONFIG_DIR/deploy.osbash"

labs/scripts/osbash/base_fixups.sh

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

labs/scripts/osbash/enable_osbash_ssh_keys.sh

@@ -4,7 +4,7 @@ set -o errexit -o nounset
 # This script installs the insecure osbash ssh keys. This allows users to
 # log into the VMs using these keys instead of a password.
 
-TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
+TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$LIB_DIR/functions.guest"
 

labs/scripts/osbash/init_xxx_node.sh

@@ -4,7 +4,7 @@ set -o errexit -o nounset
 # This scripts configures hostname and networking for all nodes. The filename
 # determines the node name.
 
-TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
+TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/credentials"
 source "$LIB_DIR/functions.guest"

labs/scripts/osbash/wait_debug.sh

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

labs/scripts/setup_lbaas_controller.sh

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

labs/scripts/shutdown.sh

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

labs/scripts/shutdown_controller.sh

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

labs/scripts/ubuntu/apt_init.sh

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

labs/scripts/ubuntu/apt_install_mysql.sh

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

labs/scripts/ubuntu/apt_pre-download.sh

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

labs/scripts/ubuntu/apt_upgrade.sh

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

labs/scripts/ubuntu/install_rabbitmq.sh

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

labs/scripts/ubuntu/setup_cinder_controller.sh

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

labs/scripts/ubuntu/setup_cinder_volumes.sh

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

labs/scripts/ubuntu/setup_glance.sh

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

labs/scripts/ubuntu/setup_horizon.sh

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

labs/scripts/ubuntu/setup_keystone.sh

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

labs/scripts/ubuntu/setup_lbaas_network.sh

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

labs/scripts/ubuntu/setup_neutron_compute.sh

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

labs/scripts/ubuntu/setup_neutron_controller.sh

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

labs/scripts/ubuntu/setup_neutron_network.sh

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

labs/scripts/ubuntu/setup_nova_compute.sh

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

labs/scripts/ubuntu/setup_nova_controller.sh

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

labs/scripts/yum_init.sh

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

labs/scripts/yum_update.sh

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

labs/scripts/zero_empty.sh

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