aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <thomasfherbert@gmail.com>2016-08-01 18:33:48 -0400
committerKeith Burns <alagalah@gmail.com>2016-08-02 14:20:21 +0000
commit7b75d211ae7b28ace7c6eee8e00005a0c45df45d (patch)
tree14401808bee174db1790c010cb4284b4916ff294
parent734d291c2e587b4760984cf75a50912c69106bdf (diff)
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>
-rw-r--r--build-root/vagrant/Vagrantfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 5b374f2da7b..641397e82ba 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -7,6 +7,7 @@ Vagrant.configure(2) do |config|
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