chef-metal-vagrant 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf3e5266b41ba94c6ad92161be49215609d45fc
-  data.tar.gz: cdaa7cbb8841af87db367a5538dba2ba09595b45
+  metadata.gz: a07ff0eedf9e89eba8989cdc17243d58432e1ec6
+  data.tar.gz: ff8ac29e8cd1f16e7205d3c0cea531be1834b4d6
 SHA512:
-  metadata.gz: 5a348ac74589d6d5eefcb8d9378e0a969d3253159884c6500d7879afa692fbd884f8399d19d6f18d5e752a2db1eeff38df7db0848d13157d456d182101beca41
-  data.tar.gz: c63fbbae630fe4b0bbad28d101cce3d8d4f32889cfc66a40ec8378d0f6db09424b181d73de1a3b37b7b8fadd7ede921a3181396d327e9f684bf02d1182144dd4
+  metadata.gz: e2a033f8c623251ed6e9009dc673f3371bd748ea871710c7921c647d065b56e50efe3a039e56bdc5bb5c9050174778157457ab2c4c21da5fc4f751fbdc43eaf8
+  data.tar.gz: ec2df65a5bf1ebcbeb402b69950a290e6d54b6352744b9174da134cc6328fc50429f413a7f781b1b4620ed961a26475bfdbe907035e8951479dcffcdca9574a4

data/lib/chef_metal_vagrant/vagrant_provisioner.rb

@@ -90,7 +90,7 @@ module ChefMetalVagrant
       vm_name = node['name']
       old_provisioner_output = node['normal']['provisioner_output']
       node['normal']['provisioner_output'] = provisioner_output = {
-        'provisioner_url' => provisioner_url(action_handler),
+        'provisioner_url' => provisioner_url(vm_name),
         'vm_name' => vm_name,
         'vm_file_path' => File.join(cluster_path, "#{vm_name}.vm")
       }
@@ -105,8 +105,8 @@ module ChefMetalVagrant
       # This is where the work gets done:
       # Create the .vm file, start the vm, and return the Machine
       #
-      vm_file = create_vm_file(action_handler, vm_name, provisioner_output['vm_file_path'], provisioner_options)
-      start_machine(action_handler, vm_name, vm_file, provisioner_output, provisioner_options['up_timeout'])
+      vm_file_updated = create_vm_file(action_handler, vm_name, provisioner_output['vm_file_path'], provisioner_options)
+      start_machine(action_handler, vm_name, vm_file_updated, provisioner_output, provisioner_options['up_timeout'])
       machine_for(node)
     end
 
@@ -174,8 +174,8 @@ module ChefMetalVagrant
 
     protected
 
-    def provisioner_url(action_handler)
-      "vagrant_cluster://#{action_handler.node['name']}#{cluster_path}"
+    def provisioner_url(vm_name)
+      "vagrant_cluster://#{vm_name}#{cluster_path}"
     end
 
     def create_vm_file(action_handler, vm_name, vm_file_path, provisioner_options)
@@ -199,7 +199,7 @@ module ChefMetalVagrant
       end
     end
 
-    def start_machine(action_handler, vm_name, vm_file, provisioner_output, up_timeout)
+    def start_machine(action_handler, vm_name, vm_file_updated, provisioner_output, up_timeout)
       # Check current status of vm
       current_status = vagrant_status(vm_name)
       up_timeout ||= 10*60
@@ -213,7 +213,7 @@ module ChefMetalVagrant
           end
           parse_vagrant_up(result.stdout, provisioner_output)
         end
-      elsif vm_file.updated_by_last_action?
+      elsif vm_file_updated
         # Run vagrant reload if vm is running and vm file changed
         action_handler.perform_action "run vagrant reload #{vm_name}" do
           result = shell_out("vagrant reload #{vm_name}", :cwd => cluster_path, :timeout => up_timeout)

data/lib/chef_metal_vagrant/version.rb

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

metadata

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