From 8705056485a7c4e50e357f26cd6ed8347ae6d108 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Oct 2017 14:45:38 +0200 Subject: [PATCH 1/2] Vagrantfile: Use boxcutter/centos7 for all providers --- Vagrantfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 284aed064..11b0c06cc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,11 +21,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.network "forwarded_port", guest: 443, host: 8443, auto_correct: true + config.vm.box = "boxcutter/centos7" + config.vm.provision :shell, :path => ".puppet/manifests/puppet.sh" config.vm.provider :parallels do |p, override| - override.vm.box = "parallels/centos-7.2" - p.name = "Icinga Web 2 Development" # Update Parallels Tools automatically ... @@ -41,16 +41,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.provider :vmware_workstation do |v, override| - override.vm.box = "bento/centos-7.4" - v.vmx["memsize"] = "1024" v.vmx["numvcpus"] = "1" end config.vm.provider :virtualbox do |vb, override| - override.vm.box = "centos-71-x64-vbox" - override.vm.box_url = "http://boxes.icinga.com/centos-71-x64-vbox.box" - vb.customize ["modifyvm", :id, "--memory", "1024"] vb.customize ["modifyvm", :id, "--cpus", "2"] end From c3657a570059f7f19c91362078de42e110898317 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Oct 2017 14:45:58 +0200 Subject: [PATCH 2/2] Vagrantfile: Allow local customization via .Vagrantfile.local --- Vagrantfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 11b0c06cc..2f05a5669 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -57,4 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| puppet.manifest_file = "site.pp" puppet.options = "--parser=future" end + + if File.exists?(".Vagrantfile.local") then + eval(IO.read(".Vagrantfile.local"), binding) + end end