diff options
author | Markos Chandras <mchandras@suse.de> | 2018-03-12 09:50:06 +0000 |
---|---|---|
committer | Markos Chandras <mchandras@suse.de> | 2018-03-12 10:39:43 +0000 |
commit | 16b1131e8deb32df1eea1cf7c17d35ed4c29bb5f (patch) | |
tree | 89dc0c7a55903b9986bbac65240255088e04e83b /xci/installer | |
parent | e286a9a4aad9bfca02e35c2486414d33a4f053d7 (diff) |
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>
Diffstat (limited to 'xci/installer')
-rwxr-xr-x | xci/installer/osa/deploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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" |