From: Markos Chandras <mchandras@suse.de>
Date: Tue, 13 Mar 2018 16:20:20 +0000 (+0000)
Subject: Merge changes from topics 'allow-pass-ansible-arguments', 'allow-pass-ansible-argumen... 
X-Git-Tag: 6.0.0~117
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=193e3c4784824d647541d079c54ab2d1460f9e88;p=releng-xci.git

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
---

193e3c4784824d647541d079c54ab2d1460f9e88
diff --cc xci/xci-deploy.sh
index 053c12d1,8decec05..70424917
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@@ -61,9 -61,11 +61,11 @@@ source $XCI_PATH/xci/config/pinned-vers
  # source flavor configuration
  source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars"
  # source installer configuration
 -source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true
 +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"