openstack/training-labs
Code Issues Proposed changes

Fix sourcing of config/provider.*

Browse Source 
Source the provider config file only in the provider-specific library.
It makes more sense and also fixes a bug that prevented repeat-test
to work properly with repeated tests on KVM.

Change-Id: I0658aba5fe9b08a1ce01f26d4f909f80c621f54c
This commit is contained in:
Roger Luethi
2016-04-11 06:35:53 +02:00
parent cc31024623
commit c53a789f43
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
labs/osbash/lib/osbash/kvm-functions.sh
View File

@@ -1,3 +1,5 @@
source "$CONFIG_DIR/provider.$PROVIDER"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# virt-install / virsh # virt-install / virsh
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

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

@@ -1,3 +1,5 @@
source "$CONFIG_DIR/provider.$PROVIDER"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# VirtualBoxManage # VirtualBoxManage
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

1
labs/osbash/osbash.sh
View File

@@ -12,7 +12,6 @@ source "$TOP_DIR/config/localrc"
source "$TOP_DIR/config/paths" source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/openstack" source "$CONFIG_DIR/openstack"
source "$CONFIG_DIR/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$CONFIG_DIR/provider.$PROVIDER"
source "$OSBASH_LIB_DIR/lib.$DISTRO.sh" source "$OSBASH_LIB_DIR/lib.$DISTRO.sh"
source "$OSBASH_LIB_DIR/functions-host.sh" source "$OSBASH_LIB_DIR/functions-host.sh"
source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh" source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"

1
labs/osbash/tools/repeat-test.sh
View File

@@ -4,7 +4,6 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/localrc" source "$TOP_DIR/config/localrc"
source "$TOP_DIR/config/paths" source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$CONFIG_DIR/provider.$PROVIDER"
source "$OSBASH_LIB_DIR/functions-host.sh" source "$OSBASH_LIB_DIR/functions-host.sh"
source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh" source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"

1
labs/osbash/tools/restore-cluster.sh
View File

@@ -5,7 +5,6 @@ TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
source "$TOP_DIR/config/localrc" source "$TOP_DIR/config/localrc"
source "$TOP_DIR/config/paths" source "$TOP_DIR/config/paths"
source "$CONFIG_DIR/deploy.osbash" source "$CONFIG_DIR/deploy.osbash"
source "$CONFIG_DIR/provider.$PROVIDER"
source "$OSBASH_LIB_DIR/functions-host.sh" source "$OSBASH_LIB_DIR/functions-host.sh"
source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh" source "$OSBASH_LIB_DIR/$PROVIDER-functions.sh"