diff options
| -rwxr-xr-x | xci/config/env-vars | 4 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 898c5722..e8472a0d 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -55,7 +55,7 @@ export ANSIBLE_HOST_KEY_CHECKING=False # subject of the certificate export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"} export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"} -# Kubespray requires that ansible version is 2.4.4 -export XCI_KUBE_ANSIBLE_PIP_VERSION=2.4.4 +# attempt to sync Ansible version used by Kubespray with the rest +export XCI_KUBE_ANSIBLE_PIP_VERSION=$XCI_ANSIBLE_PIP_VERSION # OpenStack global requirements version export OPENSTACK_REQUIREMENTS_VERSION=${OPENSTACK_REQUIREMENTS_VERSION:-$(awk '/requirements_git_install_branch:/ {print $2}' ${XCI_PATH}/xci/installer/osa/files/openstack_services.yml)} diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 00340f30..c075734f 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -43,5 +43,6 @@ export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \ export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') -# HEAD of kubspray "master" as of 16.05.2018 -export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"38e727dbe1bdf5316fae8d645718cc8279fbda20"} +# Kubespray release v2.6.0 dated 10.08.2018 +# didn't bump to the tip of master due to open issues with the k8s v1.11.2 +export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"8b3ce6e418ccf48171eb5b3888ee1af84f8d71ba"} |