Bump kubespray version to 2.7.0

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

diff --git a/.gitignore b/.gitignore
index a9a06af..b32f4c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ src/k8splugin/plugins/**/*.so
 # KRD
 .vagrant/
 vagrant/inventory/hosts.ini
+vagrant/inventory/artifacts
 vagrant/inventory/group_vars/all.yml
 vagrant/config/pdf.yml
 vagrant/sources.list

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index dd5b77b..65c649e 100755 (executable)
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -140,7 +140,7 @@ function install_k8s {
 
     # Configure environment
     mkdir -p $HOME/.kube
-    mv $HOME/admin.conf $HOME/.kube/config
+    mv $krd_inventory_folder/artifacts/admin.conf $HOME/.kube/config
 }
 
 # install_addons() - Install Kubenertes AddOns

diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml
index 89aa21d..b259e08 100644 (file)
--- a/vagrant/playbooks/krd-vars.yml
+++ b/vagrant/playbooks/krd-vars.yml
@@ -47,4 +47,4 @@ nfd_version: 175305b1ad73be7301ac94add475cec6fef797a9
 nfd_url: "https://github.com/kubernetes-incubator/node-feature-discovery"
 
 go_version: 1.10.3
-kubespray_version: 2.6.0
+kubespray_version: 2.7.0