summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-10-05 22:45:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-05 22:45:28 +0000
commit696b79a1cdd0773c44db3f67d3665aa8399ac870 (patch)
tree6adc65ef36dbc49481c36a09bae3c258399e1e85 /vagrant
parent471a20c23e836f667224152b3ac45f648e213525 (diff)
parent5330917f06d0e923ccdfca9d029bf1c30f1e6a9f (diff)
Merge "Bump kubespray version to 2.7.0"
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/installer.sh2
-rw-r--r--vagrant/playbooks/krd-vars.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index dd5b77b6..65c649e1 100755
--- 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 89aa21db..b259e08d 100644
--- 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