summaryrefslogtreecommitdiffstats
path: root/xci/xci-deploy.sh
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-19 09:37:29 +0000
committerMarkos Chandras <mchandras@suse.de>2018-03-21 15:19:14 +0000
commit8aee976f9793f13fc7deb6b838949b12bd96a097 (patch)
tree3835a2eb146b71fedb83eebdf46929b13b0ae743 /xci/xci-deploy.sh
parent8cb2bc0cdf0565ce59546b1ec2aac513fb7fecaa (diff)
xci: files: Move Ansible installation to a library file
Installing Ansible is just one of the functions we need during XCI deployment, as such move it to a library file which can contain more functions in the future. Change-Id: I708a4e51b2b1d624d6827a8c99f3719b59227ec0 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-xxci/xci-deploy.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 04e52fec..19ae7c0e 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -64,6 +64,9 @@ source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars"
source "$XCI_PATH/xci/installer/${INSTALLER_TYPE}/env" &>/dev/null || true
# source xci configuration
source $XCI_PATH/xci/config/env-vars
+# source helpers library
+source ${XCI_PATH}/xci/files/install-lib.sh
+
# Make sure we pass XCI_PATH everywhere
export XCI_ANSIBLE_PARAMS+=" -e xci_path=${XCI_PATH}"
# Make sure everybody knows where our global roles are
@@ -118,7 +121,7 @@ echo "-------------------------------------------------------------------------"
#-------------------------------------------------------------------------------
echo "Info: Installing Ansible from pip"
echo "-------------------------------------------------------------------------"
-bash files/install-ansible.sh
+install_ansible
echo "-------------------------------------------------------------------------"
# Clone OPNFV scenario repositories