Fix sourcing of config/provider.*

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

labs/osbash/lib/osbash/kvm-functions.sh

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

labs/osbash/lib/osbash/virtualbox-functions.sh

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

labs/osbash/osbash.sh

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

labs/osbash/tools/repeat-test.sh

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

labs/osbash/tools/restore-cluster.sh

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