openstack/training-guides
Code Issues Proposed changes

Merge "Rename Bash scripts"

Browse Source
This commit is contained in:
Jenkins 2015-05-10 13:04:28 +00:00 committed by Gerrit Code Review
commit 527399d26b
14 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
labs/lib/functions.guest
View File

@ -2,7 +2,7 @@
# Sourcing this file calls functions fix_path_env and source_deploy. # Sourcing this file calls functions fix_path_env and source_deploy.
source "$LIB_DIR/functions" source "$LIB_DIR/functions.sh"
source "$LIB_DIR/functions-common-devstack" source "$LIB_DIR/functions-common-devstack"
# Make devstack's operating system identification work with nounset # Make devstack's operating system identification work with nounset

0
labs/lib/functions → labs/lib/functions.sh
View File

2
labs/lib/osbash/functions.host → labs/lib/osbash/functions-host.sh
View File

@ -1,6 +1,6 @@
# This file contains bash functions that are used by osbash on the host. # This file contains bash functions that are used by osbash on the host.
source "$LIB_DIR/functions" source "$LIB_DIR/functions.sh"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Conditional execution # Conditional execution

0
labs/lib/osbash/lib.color → labs/lib/osbash/lib-color.sh
View File

0
labs/lib/osbash/scanlib → labs/lib/osbash/scanlib.sh
View File

2
labs/lib/osbash/virtualbox.functions → labs/lib/osbash/virtualbox-functions.sh
View File

@ -682,7 +682,7 @@ function vbox_sleep {
# Booting a VM and passing boot parameters # Booting a VM and passing boot parameters
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
source "$OSBASH_LIB_DIR/scanlib" source "$OSBASH_LIB_DIR/scanlib.sh"
function _vbox_push_scancode { function _vbox_push_scancode {
local vm_name=$1 local vm_name=$1

0
labs/lib/osbash/virtualbox.install_base → labs/lib/osbash/virtualbox-install_base.sh
View File

0
labs/lib/osbash/virtualbox.install_nodes → labs/lib/osbash/virtualbox-install_nodes.sh
View File

0
labs/lib/wbatch/batch_for_windows → labs/lib/wbatch/batch_for_windows.sh
View File

10
labs/osbash.sh
View File

@ -16,10 +16,10 @@ source "$CONFIG_DIR/openstack"
source "$CONFIG_DIR/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$CONFIG_DIR/provider.virtualbox" source "$CONFIG_DIR/provider.virtualbox"
source "$OSBASH_LIB_DIR/lib.$DISTRO" source "$OSBASH_LIB_DIR/lib.$DISTRO"
source "$OSBASH_LIB_DIR/functions.host" source "$OSBASH_LIB_DIR/functions-host.sh"
source "$OSBASH_LIB_DIR/virtualbox.functions" source "$OSBASH_LIB_DIR/virtualbox-functions.sh"
source "$OSBASH_LIB_DIR/virtualbox.install_base" source "$OSBASH_LIB_DIR/virtualbox-install_base.sh"
source "$LIB_DIR/osbash/lib.color" source "$LIB_DIR/osbash/lib-color.sh"
function usage { function usage {
echo "Usage: $0 {-b|-w} [-g GUI] [--no-color] [-n] {TARGET}" echo "Usage: $0 {-b|-w} [-g GUI] [--no-color] [-n] {TARGET}"
@ -220,7 +220,7 @@ MGMT_NET_IF=$(create_network "$MGMT_NET")
DATA_NET_IF=$(create_network "$DATA_NET") DATA_NET_IF=$(create_network "$DATA_NET")
API_NET_IF=$(create_network "$API_NET") API_NET_IF=$(create_network "$API_NET")
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
source "$OSBASH_LIB_DIR/virtualbox.install_nodes" source "$OSBASH_LIB_DIR/virtualbox-install_nodes.sh"
vm_build_nodes "$CMD" vm_build_nodes "$CMD"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ENDTIME=$(date +%s) ENDTIME=$(date +%s)

2
labs/tools/get_upstart_logs.sh
View File

@ -3,7 +3,7 @@ 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/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$OSBASH_LIB_DIR/functions.host" source "$OSBASH_LIB_DIR/functions-host.sh"
CONTROLLER_PORT=2230 CONTROLLER_PORT=2230
NETWORK_PORT=2231 NETWORK_PORT=2231

2
labs/tools/repeat-test.sh
View File

@ -3,7 +3,7 @@ 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/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$OSBASH_LIB_DIR/functions.host" source "$OSBASH_LIB_DIR/functions-host.sh"
LOG_NAME=test.log LOG_NAME=test.log
RESULTS_ROOT=$LOG_DIR/test-results RESULTS_ROOT=$LOG_DIR/test-results

2
labs/tools/restore-cluster.sh
View File

@ -3,7 +3,7 @@ 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/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$OSBASH_LIB_DIR/functions.host" source "$OSBASH_LIB_DIR/functions-host.sh"
CONTROLLER_VM=controller CONTROLLER_VM=controller
NETWORK_VM=network NETWORK_VM=network

2
labs/tools/test-once.sh
View File

@ -3,7 +3,7 @@ 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/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$OSBASH_LIB_DIR/functions.host" source "$OSBASH_LIB_DIR/functions-host.sh"
# Get remote ssh port of target node (VM_SSH_PORT) # Get remote ssh port of target node (VM_SSH_PORT)
source "$CONFIG_DIR/config.controller" source "$CONFIG_DIR/config.controller"