diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2019-09-02 10:40:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-09-02 10:40:33 +0000 |
| commit | b1dffe564b9fd5547b65c93431c4389def16b7c2 (patch) | |
| tree | ab171c23410409205ffa3ed17639aafcafbf5252 /xci/config | |
| parent | d400b162a7c43472b1ea54f096b7fce4dc699253 (diff) | |
| parent | f098d178cbbaa1096786c0d181d6693461fe4eb5 (diff) | |
Merge changes from topics "bump-kubespray", "refactor-k8s-scenarios"
* changes:
Bump kubespray version to bring k8s v1.15.3
Bump ansible to 2.7.8
Refactor k8s scenario implementation
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 4 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 2cb3e915..a90e8533 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,7 +8,7 @@ export OPNFV_RELENG_GIT_URL=${OPNFV_RELENG_GIT_URL:-https://gerrit.opnfv.org/ger export OPENSTACK_BIFROST_GIT_URL=${OPENSTACK_BIFROST_GIT_URL:-https://git.openstack.org/openstack/bifrost} export OPENSTACK_OSA_GIT_URL=${OPENSTACK_OSA_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible} export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-openstack_openrc} -export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git} +export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-sigs/kubespray.git} export OSH_GIT_URL=${OSH_GIT_URL:-https://github.com/openstack/openstack-helm.git} export OSH_INFRA_GIT_URL=${OSH_INFRA_GIT_URL:-https://github.com/openstack/openstack-helm-infra.git} export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server} @@ -57,7 +57,7 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs} # 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")} -export XCI_ANSIBLE_PIP_VERSION="2.5.8" +export XCI_ANSIBLE_PIP_VERSION="2.7.8" export ANSIBLE_HOST_KEY_CHECKING=False export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"} diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index e40cf442..440972ae 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -48,5 +48,8 @@ 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') -# Kubespray release v2.7.0 dated 02.10.2018 -export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"v2.7.0"} +# Kubespray release v2.11.0 dated 31.08.2019 +export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"v2.11.0"} +# Kubernetes version supported by the pinned kubespray version +# this is needed for pulling in kubectl +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.15.3"} |