openstack/training-guides
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-03-23 05:41:24 +00:00 committed by Gerrit Code Review
commit d25fb68db4
31 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/osbash.sh
View File

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

2
labs/scripts/config_external_network.sh
View File

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

2
labs/scripts/config_tenant_network.sh
View File

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

2
labs/scripts/etc_hosts.sh
View File

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

2
labs/scripts/osbash/activate_autostart.sh
View File

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

2
labs/scripts/osbash/base_fixups.sh
View File

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

2
labs/scripts/osbash/enable_osbash_ssh_keys.sh
View File

@ -4,7 +4,7 @@ set -o errexit -o nounset
# This script installs the insecure osbash ssh keys. This allows users to # This script installs the insecure osbash ssh keys. This allows users to
# log into the VMs using these keys instead of a password. # 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 "$TOP_DIR/config/paths"
source "$LIB_DIR/functions.guest" source "$LIB_DIR/functions.guest"

2
labs/scripts/osbash/init_xxx_node.sh
View File

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

2
labs/scripts/osbash/wait_debug.sh
View File

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

2
labs/scripts/setup_lbaas_controller.sh
View File

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

2
labs/scripts/shutdown.sh
View File

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

2
labs/scripts/shutdown_controller.sh
View File

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

2
labs/scripts/ubuntu/apt_init.sh
View File

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

2
labs/scripts/ubuntu/apt_install_mysql.sh
View File

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

2
labs/scripts/ubuntu/apt_pre-download.sh
View File

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

2
labs/scripts/ubuntu/apt_upgrade.sh
View File

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

2
labs/scripts/ubuntu/install_rabbitmq.sh
View File

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

2
labs/scripts/ubuntu/setup_cinder_controller.sh
View File

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

2
labs/scripts/ubuntu/setup_cinder_volumes.sh
View File

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

2
labs/scripts/ubuntu/setup_glance.sh
View File

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

2
labs/scripts/ubuntu/setup_horizon.sh
View File

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

2
labs/scripts/ubuntu/setup_keystone.sh
View File

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

2
labs/scripts/ubuntu/setup_lbaas_network.sh
View File

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

2
labs/scripts/ubuntu/setup_neutron_compute.sh
View File

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

2
labs/scripts/ubuntu/setup_neutron_controller.sh
View File

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

2
labs/scripts/ubuntu/setup_neutron_network.sh
View File

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

2
labs/scripts/ubuntu/setup_nova_compute.sh
View File

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

2
labs/scripts/ubuntu/setup_nova_controller.sh
View File

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

2
labs/scripts/yum_init.sh
View File

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

2
labs/scripts/yum_update.sh
View File

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

2
labs/scripts/zero_empty.sh
View File

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