From: Victor Morales <victor.morales@intel.com>
Date: Wed, 5 Dec 2018 09:28:06 +0000 (-0800)
Subject: Bump kubespray version to 2.8.0
X-Git-Tag: 0.1.0~96
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b25c8a59e4ce694ef2e621bc3eab9116f0a14e17;p=multicloud%2Fk8s.git

Bump kubespray version to 2.8.0

Change-Id: Ie7287f0bd0940fae67af2b1374c7be2fef37844e
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-301
---

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index f1109073..e8ed9f11 100755
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -111,6 +111,7 @@ function install_k8s {
     else
         echo "kube_log_level: 2" | tee $krd_inventory_folder/group_vars/all.yml
     fi
+    echo "kubeadm_enabled: true" | tee --append $krd_inventory_folder/group_vars/all.yml
     if [[ -n "${http_proxy}" ]]; then
         echo "http_proxy: \"$http_proxy\"" | tee --append $krd_inventory_folder/group_vars/all.yml
     fi
diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml
index 01e05ec4..0269b9bb 100644
--- a/vagrant/playbooks/krd-vars.yml
+++ b/vagrant/playbooks/krd-vars.yml
@@ -52,6 +52,6 @@ istio_version: 1.0.3
 istio_url: "https://github.com/istio/istio/releases/download/{{ istio_version }}/istio-{{ istio_version }}-linux.tar.gz"
 
 go_version: '1.11'
-kubespray_version: 2.7.0
+kubespray_version: 2.8.0
 kubectl_version: 1.11.2
 helm_client_version: 2.9.1