commit 7b75d211ae7b28ace7c6eee8e00005a0c45df45d
author Thomas F Herbert <thomasfherbert@gmail.com> Mon Aug 01 18:33:48 2016 -0400
committer Keith Burns <alagalah@gmail.com> Tue Aug 02 14:20:21 2016 +0000
tree 14401808bee174db1790c010cb4284b4916ff294
parent 734d291c2e587b4760984cf75a50912c69106bdf

Fix for broken vagrant installs when using Vagrant 1.8.5.

I upgraded Fedora23 which installed kernel 4.6.4 which in turn required
VirtualBox 5.1.2 which in turn required Vagrant 1.8.5.

Workaround for a change in Vagrant 1.8.5 that breaks Centos. The
newer version of Vagrant doesn't chmod the ssh directory before trying to copy
new public key during installs. This will be fixed upstream in Vagrant 1.8.6.
Bug doesn't affect Ubuntu because it uses a different umask whereas Centos uses
0002.

Change-Id: I8108d4cc208fc47fa69f8a5cf27b2bba7e34293e
Signed-off-by: Thomas F Herbert <therbert@redhat.com>

build-root/vagrant/Vagrantfile

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 5b374f2..641397e 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -7,6 +7,7 @@
   distro = ( ENV['VPP_VAGRANT_DISTRO'] || "ubuntu1404")
   if distro == 'centos7'
     config.vm.box = "puppetlabs/centos-7.2-64-nocm"
+    config.ssh.insert_key = false
   else
     config.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
   end