From 16b1131e8deb32df1eea1cf7c17d35ed4c29bb5f Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Mon, 12 Mar 2018 09:50:06 +0000
Subject: xci: Pass the XCI_PATH variable to all Ansible calls

The XCI_PATH variable is used by various playbooks to find the root
directory of the XCI repository so it's much cleaner to pass it on every
Ansible call.

Change-Id: Ifc0b77fa767e48bd1dc6daa44c6251c02983fd4d
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 xci/installer/osa/deploy.sh | 6 +++---
 xci/xci-deploy.sh           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'xci')

diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh
index fa6098ba..3c27fd79 100755
--- a/xci/installer/osa/deploy.sh
+++ b/xci/installer/osa/deploy.sh
@@ -39,7 +39,7 @@ fi
 echo "Info: Configuring localhost for openstack-ansible"
 echo "-----------------------------------------------------------------------"
 cd $XCI_PLAYBOOKS
-ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" -i inventory configure-localhost.yml
+ansible-playbook ${XCI_ANSIBLE_PARAMS} -i inventory configure-localhost.yml
 echo "-----------------------------------------------------------------------"
 echo "Info: Configured localhost host for openstack-ansible"
 
@@ -57,7 +57,7 @@ echo "Info: Configured localhost host for openstack-ansible"
 echo "Info: Configuring opnfv deployment host for openstack-ansible"
 echo "-----------------------------------------------------------------------"
 cd $OSA_XCI_PLAYBOOKS
-ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
+ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
     configure-opnfvhost.yml
 echo "-----------------------------------------------------------------------"
 echo "Info: Configured opnfv deployment host for openstack-ansible"
@@ -77,7 +77,7 @@ if [[ $XCI_FLAVOR != "aio" ]]; then
     echo "Info: Configuring target hosts for openstack-ansible"
     echo "-----------------------------------------------------------------------"
     cd $OSA_XCI_PLAYBOOKS
-    ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
+    ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
         configure-targethosts.yml
     echo "-----------------------------------------------------------------------"
     echo "Info: Configured target hosts"
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index cf56151c..8decec05 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -64,6 +64,8 @@ source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars"
 source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true
 # source xci configuration
 source $XCI_PATH/xci/config/env-vars
+# Make sure we pass XCI_PATH everywhere
+export XCI_ANSIBLE_PARAMS+=" -e XCI_PATH=${XCI_PATH}"
 
 if [[ -z $(echo $PATH | grep "$HOME/.local/bin")  ]]; then
     export PATH="$HOME/.local/bin:$PATH"
-- 
cgit 1.2.3-korg