chef-metal-vagrant 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87c1ff4863d5dd308daf58ae90f1acb12ddc8eb
-  data.tar.gz: 3f32ecaad5a7075fb4551486ec2d55a97df2e665
+  metadata.gz: 9cf3e5266b41ba94c6ad92161be49215609d45fc
+  data.tar.gz: cdaa7cbb8841af87db367a5538dba2ba09595b45
 SHA512:
-  metadata.gz: 4467be72de80093ae76247ef90b1b664ec4957d5bf6f057501db8190cea53bf24f3532ea9c5a3d8e4952f154cfafae8cefce8809ea24657877c28e3423d4f9e4
-  data.tar.gz: d8c1fc591cfc9456dd278d54e7af7e5bb7c838317001245cbf35d3fe6aadc38b46e4b874e1b4f26062719216eb70e9da86f03a08a165fc9556195b096fc9de13
+  metadata.gz: 5a348ac74589d6d5eefcb8d9378e0a969d3253159884c6500d7879afa692fbd884f8399d19d6f18d5e752a2db1eeff38df7db0848d13157d456d182101beca41
+  data.tar.gz: c63fbbae630fe4b0bbad28d101cce3d8d4f32889cfc66a40ec8378d0f6db09424b181d73de1a3b37b7b8fadd7ede921a3181396d327e9f684bf02d1182144dd4

data/README.md

@@ -1,3 +1,3 @@
-# chef-metal-fog
+# chef-metal-vagrant
 
-This is the Fog provisioner for chef-metal.  It provides EC2, DigitalOcean and Openstack functionality.
+This is the Vagrant provisioner for chef-metal.

data/lib/chef/resource/vagrant_box.rb

@@ -13,6 +13,6 @@ class Chef::Resource::VagrantBox < Chef::Resource::LWRPBase
 
   def after_created
     super
-    ChefMetal.with_vagrant_box self
+    ChefMetalVagrant.with_vagrant_box run_context, self
   end
 end

data/lib/chef/resource/vagrant_cluster.rb

@@ -11,6 +11,6 @@ class Chef::Resource::VagrantCluster < Chef::Resource::LWRPBase
 
   def after_created
     super
-    ChefMetal.with_vagrant_cluster path
+    run_context.chef_metal.with_provisioner ChefMetalVagrant::VagrantProvisioner.new(path)
   end
 end

data/lib/chef_metal_vagrant.rb

@@ -5,35 +5,27 @@ require 'chef/resource/vagrant_box'
 require 'chef/provider/vagrant_box'
 require 'chef_metal_vagrant/vagrant_provisioner'
 
-module ChefMetal
-  def self.with_vagrant_cluster(cluster_path, &block)
-    with_provisioner(ChefMetalVagrant::VagrantProvisioner.new(cluster_path), &block)
-  end
-
-  def self.with_vagrant_box(box_name, provisioner_options = nil, &block)
+module ChefMetalVagrant
+  def self.with_vagrant_box(run_context, box_name, vagrant_options = {}, &block)
     if box_name.is_a?(Chef::Resource::VagrantBox)
-      provisioner_options ||= box_name.provisioner_options || {}
-      provisioner_options['vagrant_options'] ||= {}
-      provisioner_options['vagrant_options']['vm.box'] = box_name.name
-      provisioner_options['vagrant_options']['vm.box_url'] = box_name.url if box_name.url
+      new_options = { 'vagrant_options' => { 'vm.box' => box_name.name } }
+      new_options['vagrant_options']['vm.box_url'] = box_name.url if box_name.url
     else
-      provisioner_options ||= {}
-      provisioner_options['vagrant_options'] ||= {}
-      provisioner_options['vagrant_options']['vm.box'] = box_name
+      new_options = { 'vagrant_options' => { 'vm.box' => box_name } }
     end
 
-    with_provisioner_options(provisioner_options, &block)
+    run_context.chef_metal.add_provisioner_options(new_options, &block)
   end
 end
 
 class Chef
   class Recipe
     def with_vagrant_cluster(cluster_path, &block)
-      ChefMetal.with_vagrant_cluster(cluster_path, &block)
+      with_provisioner(ChefMetalVagrant::VagrantProvisioner.new(cluster_path), &block)
     end
 
     def with_vagrant_box(box_name, vagrant_options = {}, &block)
-      ChefMetal.with_vagrant_box(box_name, vagrant_options, &block)
+      ChefMetalVagrant.with_vagrant_box(run_context, box_name, vagrant_options, &block)
     end
   end
 end

data/lib/chef_metal_vagrant/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVagrant
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-vagrant
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef