kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gwens...@apache.org
Subject kafka git commit: KAFKA-2330: Vagrantfile sets global configs instead of per-provider override configs; patched by Ewen Cheslack-Postava, reviewed by Geoff Anderson and Gwen Shapira
Date Thu, 20 Aug 2015 01:21:23 GMT
Repository: kafka
Updated Branches:
  refs/heads/trunk 0b04f9f34 -> e4fc456ab


KAFKA-2330: Vagrantfile sets global configs instead of per-provider override configs; patched
by Ewen Cheslack-Postava, reviewed by Geoff Anderson and Gwen Shapira


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/e4fc456a
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/e4fc456a
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/e4fc456a

Branch: refs/heads/trunk
Commit: e4fc456ab06a228c4228cbae58d391de1b768f9e
Parents: 0b04f9f
Author: Ewen Cheslack-Postava <me@ewencp.org>
Authored: Wed Aug 19 18:20:13 2015 -0700
Committer: Gwen Shapira <cshapi@gmail.com>
Committed: Wed Aug 19 18:20:51 2015 -0700

----------------------------------------------------------------------
 Vagrantfile       | 6 +++---
 vagrant/README.md | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/e4fc456a/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index 28bf24a..31b99b4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -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
@@ -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)

http://git-wip-us.apache.org/repos/asf/kafka/blob/e4fc456a/vagrant/README.md
----------------------------------------------------------------------
diff --git a/vagrant/README.md b/vagrant/README.md
index 73cf039..6fa8e78 100644
--- a/vagrant/README.md
+++ b/vagrant/README.md
@@ -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
 


Mime
View raw message