Skip to content

Commit

Permalink
KAFKA-2330: Vagrantfile sets global configs instead of per-provider o…
Browse files Browse the repository at this point in the history
…verride configs; patched by Ewen Cheslack-Postava, reviewed by Geoff Anderson and Gwen Shapira
  • Loading branch information
ewencp authored and gwenshap committed Aug 20, 2015
1 parent 0b04f9f commit e4fc456
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,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
Expand Down Expand Up @@ -148,7 +148,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/', 'tests/results/', 'results/']
end

def name_node(node, name)
Expand Down
4 changes: 2 additions & 2 deletions vagrant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Using Vagrant to get up and running.
2) Install Vagrant >= 1.6.4 [http://www.vagrantup.com/](http://www.vagrantup.com/)
3) Install Vagrant Plugins:

# Required
$ vagrant plugin install vagrant-hostmanager
# Required (1.5.0 or 1.4 currently required due to implementation changes in the plugin)
$ vagrant plugin install vagrant-hostmanager --plugin-version 1.5.0
# Optional
$ vagrant plugin install vagrant-cachier # Caches & shares package downloads across VMs

Expand Down

0 comments on commit e4fc456

Please sign in to comment.