diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-08-30 22:18:43 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-08-30 22:18:43 +0200 |
| commit | ba0f4d74ff7505055a1fd911fd40a760a3370baf (patch) | |
| tree | fc7d5e7d02ec62f3564a8e7aea036fe9d8fdfd39 /xci/config/env-vars | |
| parent | 9d434f81639e8692826f37e1887c65e29ac28809 (diff) | |
xci: Bump Kubespray SHA and sync Ansible versions
This change
- bumps kubespray version to 8b3ce6e418ccf48171eb5b3888ee1af84f8d71ba, taking
Kubernetes version from 1.10.2 to 1.10.4.
- pins Ansible version used by Kubespray to same Ansible version as the rest.
The var kept as is in case if we need to pin Kubespray to a different Ansible
version in future.
installer-type:kubespray
deploy-scenario:k8-calico-nofeature
Change-Id: Iefbe82f0b9b10296e4362bca07630047c56630ac
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/config/env-vars')
| -rwxr-xr-x | xci/config/env-vars | 4 |
1 files changed, 2 insertions, 2 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)} |