Enable vagrant-cachier and check if vagrant-berkshelf is available
Add two changes from the main Vagrantfile also to the Vagrantfiles in ds-build and split. * Id3aeaa16e062f764412bd6c5fd9460b5867333a9 (vagrant-cachier) * Ie615cf81be40b8395d8e7672e59407cc4925b410 (vagrant-berkshelf) Change-Id: I2309db433c547736732217ffcd1e1f440d1684ab
This commit is contained in:
parent
961e2d713b
commit
2aa4faca0f
9
ds-build/Vagrantfile
vendored
9
ds-build/Vagrantfile
vendored
@ -6,10 +6,19 @@ Dir.chdir ".."
|
||||
|
||||
VAGRANTFILE_API_VERSION = "2" # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
|
||||
|
||||
unless Vagrant.has_plugin?("vagrant-berkshelf")
|
||||
raise "The needed plugin vagrant-berkshelf is not available.
|
||||
Install it by calling 'vagrant plugin install vagrant-berkshelf'."
|
||||
end
|
||||
|
||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
# Settings for all vms
|
||||
config.berkshelf.enabled = true
|
||||
|
||||
if Vagrant.has_plugin?("vagrant-cachier")
|
||||
config.cache.scope = :box
|
||||
end
|
||||
|
||||
# Handle local proxy settings
|
||||
if Vagrant.has_plugin?("vagrant-proxyconf")
|
||||
if ENV["http_proxy"]
|
||||
|
9
split/Vagrantfile
vendored
9
split/Vagrantfile
vendored
@ -6,10 +6,19 @@ Dir.chdir ".."
|
||||
|
||||
VAGRANTFILE_API_VERSION = "2" # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
|
||||
|
||||
unless Vagrant.has_plugin?("vagrant-berkshelf")
|
||||
raise "The needed plugin vagrant-berkshelf is not available.
|
||||
Install it by calling 'vagrant plugin install vagrant-berkshelf'."
|
||||
end
|
||||
|
||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
# Settings for all vms
|
||||
config.berkshelf.enabled = true
|
||||
|
||||
if Vagrant.has_plugin?("vagrant-cachier")
|
||||
config.cache.scope = :box
|
||||
end
|
||||
|
||||
# Handle local proxy settings
|
||||
if Vagrant.has_plugin?("vagrant-proxyconf")
|
||||
if ENV["http_proxy"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user