diff options
Diffstat (limited to 'xci')
| -rwxr-xr-x | xci/installer/osa/deploy.sh | 6 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 2 |
2 files changed, 5 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" 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" |