Merge "xci: Ensure using flavor inventory"

[releng.git] / prototypes / xci / xci-deploy.sh

diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 401c098..277206d 100755 (executable)
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -13,14 +13,14 @@ fi
 # find where are we
 XCI_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# source pinned versions
-source $XCI_PATH/config/pinned-versions
-
 # source user vars
 source $XCI_PATH/config/user-vars
 
+# source pinned versions
+source $XCI_PATH/config/pinned-versions
+
 # source flavor configuration
-source $XCI_PATH/flavors/$XCI_FLAVOR
+source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars"
 
 # source xci configuration
 source $XCI_PATH/config/env-vars
@@ -40,7 +40,7 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 echo "Info: Cleaning up the previous deployment"
 $XCI_PATH/../bifrost/scripts/destroy-env.sh > /dev/null 2>&1
-/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible /opt/stack
+/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible
 
 #-------------------------------------------------------------------------------
 # Clone the repositories and checkout the versions