Merge pull request #121 from jasherai/enable_vagrant_ip_settings_in_k…

…nife_org Make vagrant ip settings work from knife-org.rb
infochimps-labs · Apr 5, 2012 · 18d2261 · 18d2261
2 parents 37604fa + 6bb3444
commit 18d2261
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/chef/knife/cluster_vagrant.rb b/lib/chef/knife/cluster_vagrant.rb
@@ -63,7 +63,7 @@ class ClusterVagrant < Knife
 
       def run
         # The subnet for this world
-        Chef::Config.host_network_blk   ||= '33.33.33'
+        Chef::Config.host_network_base   ||= '33.33.33'
         # Location that cookbooks, roles, etc will be mounted on vm
         # set to false to skip
         Chef::Config.homebase_on_vm_dir "/homebase" if Chef::Config.homebase_on_vm_dir.nil?

diff --git a/lib/chef/knife/vagrant/skeleton_vagrantfile.rb b/lib/chef/knife/vagrant/skeleton_vagrantfile.rb
@@ -33,7 +33,7 @@
   #
 
   def ip_for(svr)
-    "#{Chef::Config.host_network_blk}.#{30 + svr.facet_index}"
+    "#{Chef::Config.host_network_base}.#{(Chef::Config.host_network_ip_mapping[svr.facet_name] || 30) + svr.facet_index}"
   end
 
   # FIXME: things like this should be imputed by the `cloud` statement