diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 7 | ||||
| -rwxr-xr-x | xci/config/user-vars | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 976eb66b..d8e71244 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -12,9 +12,10 @@ export OPNFV_XCI_PATH=$OPNFV_RELENG_PATH/xci export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_XCI_PATH/file/$XCI_FLAVOR export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} -# TODO: this currently matches to bifrost ansible version -# there is perhaps better way to do this -export XCI_ANSIBLE_PIP_VERSION=2.1.5.0 +# This currently matches to OSA Ansible version but it doesn't really +# matter since bifrost and OSA will use the Ansible version they need. +# Overall, it's better to use what OSA supports so we can use new features. +export XCI_ANSIBLE_PIP_VERSION=2.3.2.0 export ANSIBLE_HOST_KEY_CHECKING=False export DISTRO=${DISTRO:-ubuntu} export DIB_OS_RELEASE=${DIB_OS_RELEASE:-xenial} diff --git a/xci/config/user-vars b/xci/config/user-vars index 709aa29e..ecde6db9 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -52,7 +52,7 @@ export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/s # ANSIBLE_VERBOSITY="-v" # or # ANSIBLE_VERBOSITY="-vvvv" -export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""} +export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY:-""} export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs} export RUN_TEMPEST=${RUN_TEMPEST:-false} # Set this to to true to force XCI to re-create the target OS images |