summaryrefslogtreecommitdiffstats
path: root/xci/config/env-vars
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-08-30 17:21:13 +0100
committerMarkos Chandras <mchandras@suse.de>2018-08-30 19:32:10 +0000
commitf69e62cdf7b5f75d2104a6184f5e02cb07d02682 (patch)
tree1ce7951e7d29727285dcb75d8b5c3ac93419aac1 /xci/config/env-vars
parent0b2e5383eb16bfaf8846d1c584ce16f702c25acc (diff)
xci: Bump OSA and bifrost SHAs
This change - bumps OSA SHA to b9d9269528ecbe04b2638a73c2b0f49839f27422 - bumps bifrost SHA to 0d0cfd908d10a670668619c575fd338d1ff328b7 - Pins Ansible to 2.5.8. OSA is using 2.5.5 which has a bug in the pause module so we need to use something newer. Change-Id: Idf05bbef880db11de4a41464ae5080aa21a0613c Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/config/env-vars')
-rwxr-xr-xxci/config/env-vars6
1 files changed, 4 insertions, 2 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index 36ae97c0..898c5722 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -45,9 +45,11 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}
# 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.
+# OSA currently has 2.5.5 which breaks due to missing
+# https://github.com/ansible/ansible/commit/67859c3476501d5d9839fd904aec55468d09593a
+# This was fixed in 2.5.6 so remove the pin when OSA updates to newer version.
#export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")}
-# bifrost needs 2.4 but OSA is currently on 2.6
-export XCI_ANSIBLE_PIP_VERSION="2.4.6.0"
+export XCI_ANSIBLE_PIP_VERSION="2.5.8"
export ANSIBLE_HOST_KEY_CHECKING=False
# subject of the certificate