summaryrefslogtreecommitdiffstats
path: root/xci/var
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2019-09-02 10:40:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-09-02 10:40:33 +0000
commitb1dffe564b9fd5547b65c93431c4389def16b7c2 (patch)
treeab171c23410409205ffa3ed17639aafcafbf5252 /xci/var
parentd400b162a7c43472b1ea54f096b7fce4dc699253 (diff)
parentf098d178cbbaa1096786c0d181d6693461fe4eb5 (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/var')
-rw-r--r--xci/var/opnfv.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 8e4f9b8d..91b9ee38 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -28,6 +28,7 @@ openstack_osa_haproxy_git_url: "{{ lookup('env','OPENSTACK_OSA_HAPROXY_GIT_URL')
# kubespray variables
kubespray_git_url: "{{ lookup('env','KUBESPRAY_GIT_URL') }}"
kubespray_version: "{{ lookup('env','KUBESPRAY_VERSION') }}"
+kubernetes_version: "{{ lookup('env','KUBERNETES_VERSION') }}"
xci_kube_ansible_pip_version: "{{ lookup('env','XCI_KUBE_ANSIBLE_PIP_VERSION') }}"
# openstack-helm variables