From da3a2d78e75eabfedd95560b99843c934089fdf9 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Mon, 5 Sep 2016 02:29:54 -0700 Subject: [PATCH 1/2] Vagrantfile: do not insert invalid ssh key when provisioning VMs on vagrant 1.8.5 Signed-off-by: Erik Hollensbe --- Vagrantfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 0520036144f..3ef5436c056 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -122,6 +122,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.proxy.https = $https_proxy config.proxy.no_proxy = $no_proxy end + + # this corrects a bug in 1.8.5 where an invalid SSH key is inserted. + if Vagrant::VERSION == "1.8.5" + config.ssh.insert_key = false + end + def setvmboxandurl(config, provider) if ENV['KUBERNETES_BOX_NAME'] then config.vm.box = ENV['KUBERNETES_BOX_NAME'] From eec97a7e662880eeeb9b21971da6152eec0200d1 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Mon, 5 Sep 2016 02:30:28 -0700 Subject: [PATCH 2/2] Vagrantfile: Remove unused variables Signed-off-by: Erik Hollensbe --- Vagrantfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3ef5436c056..68de73639a0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -299,8 +299,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Kubernetes node $num_node.times do |n| node_vm_name = "node-#{n+1}" - node_prefix = ENV['INSTANCE_PREFIX'] || 'kubernetes' # must mirror default in cluster/vagrant/config-default.sh - node_hostname = "#{node_prefix}-#{node_vm_name}" config.vm.define node_vm_name do |node| customize_vm node, $vm_node_mem