diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-13 16:20:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-13 16:20:20 +0000 |
| commit | 193e3c4784824d647541d079c54ab2d1460f9e88 (patch) | |
| tree | 3224cda88e1d8f3e8756b2cc7745cbf358d46dee /xci/xci-deploy.sh | |
| parent | c6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (diff) | |
| parent | 6514b1ac8b4cc5b98085776546077cd588d0739e (diff) | |
Merge changes from topics 'allow-pass-ansible-arguments', 'allow-pass-ansible-arguments-force-verify'
* changes:
xci: OSA: Fix warning about missing inventory file
xci: Pass the XCI_PATH variable to all Ansible calls
xci: Rename XCI_ANSIBLE_VERBOSITY to XCI_ANSIBLE_PARAMS
Diffstat (limited to 'xci/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 053c12d1..70424917 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/${INSTALLER_TYPE}/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" @@ -112,7 +114,7 @@ echo "-------------------------------------------------------------------------" echo "Info: Cloning OPNFV scenario repositories" echo "-------------------------------------------------------------------------" cd $XCI_PATH/xci/playbooks -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i "localhost," get-opnfv-scenario-requirements.yml +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i "localhost," get-opnfv-scenario-requirements.yml echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- @@ -137,7 +139,7 @@ sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers cd $XCI_PATH/bifrost/ sudo -E bash ./scripts/destroy-env.sh cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i "localhost," bootstrap-bifrost.yml +ansible-playbook ${XCI_ANSIBLE_PARAMS} -i "localhost," bootstrap-bifrost.yml cd ${XCI_CACHE}/repos/bifrost bash ./scripts/bifrost-provision.sh echo "-----------------------------------------------------------------------" |