From 204bacbf175d081bf65c00aab35995f6ac4d94c3 Mon Sep 17 00:00:00 2001 From: Ewen Cheslack-Postava Date: Sat, 11 Jul 2015 19:09:58 -0700 Subject: [PATCH] KAFKA-2330: Make provider-specific overrides in Vagrantfile apply only to the targeted provider. --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1d7cc01..3a542ed 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -67,14 +67,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ["modifyvm", :id, "--memory", ram_megabytes.to_s] if Vagrant.has_plugin?("vagrant-cachier") - config.cache.scope = :box + override.cache.scope = :box # Besides the defaults, we use a custom cache to handle the Oracle JDK # download, which downloads via wget during an apt install. Because of the # way the installer ends up using its cache directory, we need to jump # through some hoops instead of just specifying a cache directly -- we # share to a temporary location and the provisioning scripts symlink data # to the right location. - config.cache.enable :generic, { + override.cache.enable :generic, { "oracle-jdk7" => { cache_dir: "/tmp/oracle-jdk7-installer-cache" }, } end @@ -110,7 +110,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end # Exclude some directories that can grow very large from syncing - config.vm.synced_folder ".", "/vagrant", type: "rsync", :rsync_excludes => ['.git', 'core/data/', 'logs/', 'system_test/'] + override.vm.synced_folder ".", "/vagrant", type: "rsync", :rsync_excludes => ['.git', 'core/data/', 'logs/', 'system_test/'] end def name_node(node, name) -- 2.4.3