summaryrefslogtreecommitdiffstats
path: root/xci/var
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2019-08-31 18:50:05 +0200
committerFatih Degirmenci <fdegir@gmail.com>2019-09-01 02:45:10 +0200
commit5ed2d835de246e3cfb0878d78b382115ec8f0987 (patch)
treef0c515ce1da4444eae0334cf73fcd99d8f9708d8 /xci/var
parent0326442e753be727c2342b7caf9606393f84d744 (diff)
Refactor k8s scenario implementation
This change updates the scenario logic for basic k8s scenarios that enables the use of various network plugins. The change simply stops copying k8s-cluster.yml over but instead operates on the existing/original k8s-cluster.yml and updates kube_network_plugin in place. This makes it easier to maintain the scenarios and more importantly unblocks us from bumping kubespray and kubernetes versions. Please note that opnfv-scenario-requirements.yml contains version and the refspec of the corresponding change in releng-xci-scenarios repo so this change must be verified properly and if it passes CI, it needs to be amended, updating k8-calico-nofeature scenario's version to master and submitted. And then the change in releng-xci-scenarios can properly be verified. https://gerrit.opnfv.org/gerrit/#/c/releng-xci-scenarios/+/68418/ installer-type:kubespray deploy-scenario:k8-calico-nofeature JIRA: XCI-20 Change-Id: I1f851d20f5f7bc256199303581b05659091fddf9 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
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