labs: make TOP_DIR more robust with blanks in path
Make TOP_DIR more robust when blanks are part of the TOP_DIR path. Change-Id: I868e3406f358da24049d1e1bdbb4a8197f294a63
This commit is contained in:
parent
b4da4b1964
commit
92003cdb16
labs
osbash.sh
scripts
config_external_network.shconfig_tenant_network.shetc_hosts.sh
osbash
setup_lbaas_controller.shshutdown.shshutdown_controller.shubuntu
apt_init.shapt_install_mysql.shapt_pre-download.shapt_upgrade.shinstall_rabbitmq.shsetup_cinder_controller.shsetup_cinder_volumes.shsetup_glance.shsetup_horizon.shsetup_keystone.shsetup_lbaas_network.shsetup_neutron_compute.shsetup_neutron_controller.shsetup_neutron_network.shsetup_nova_compute.shsetup_nova_controller.sh
yum_init.shyum_update.shzero_empty.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}
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user