chef-metal-vsphere 0.1.3 → 0.1.4

data/README.md

@@ -69,9 +69,14 @@ Create or obtain a unix/linux VM template.  The VM template must:
 
 This will clone your VM template to create two VMware Virtual Machines, "metal_1" and "metal_2", in the vSphere Folder specified by vm_folder, bootstrapped to an empty runlist.  It will then stop (guest shutdown) and delete the vms.
 
+Roadmap
+-------
+
+Check out [TODO.md](TODO.md)
+
 Bugs and Contact
 ----------------
 
-Please submit bugs at [https://github.com/RallySoftware-cookbooks/chef-metal-vsphere], contact Brian Dupras on Twitter at @briandupras, email at rallysoftware-cookbooks@rallydev.com.
+Please submit bugs at [chef-metal-vpshere](https://github.com/RallySoftware-cookbooks/chef-metal-vsphere), contact Brian Dupras on Twitter at @briandupras, email at rallysoftware-cookbooks@rallydev.com.
 
 *Warning* if you get an rbvmomi error regarding VMODL::AnyType, add `gem 'nokogiri', '1.5.5'` to your dependencies.

data/lib/chef_metal_vsphere/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalVsphere
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/chef_metal_vsphere/vsphere_helpers.rb

@@ -24,6 +24,21 @@ module ChefMetalVsphere
       vm     = folder.find(vm_name, RbVmomi::VIM::VirtualMachine)
     end
 
+    def vm_started?(vm, wait_on_port = 22)
+      return false if vm.nil?
+      state = vm.runtime.powerState
+      return false unless state == 'poweredOn'
+      return false unless port_ready?(vm, wait_on_port)
+      return true
+    end
+
+    def vm_stopped?(vm)
+      return true if vm.nil?
+      state = vm.runtime.powerState
+      return false unless state == 'poweredOff'
+      return false
+    end
+
     def start_vm(vm, wait_on_port = 22)
       state = vm.runtime.powerState
       unless state == 'poweredOn'

data/lib/chef_metal_vsphere/vsphere_provisioner.rb

@@ -137,8 +137,10 @@ module ChefMetalVsphere
 
       vm = vm_instance(action_handler, node)
 
-      action_handler.perform_action "Start VM and wait for ssh [#{vm_folder}/#{vm_name}]" do
-        start_vm(vm, wait_on_port)
+      unless vm_started?(vm, wait_on_port)
+        action_handler.perform_action "Start VM and wait for port #{wait_on_port}" do
+          start_vm(vm, wait_on_port)
+        end
       end
 
       machine = machine_for(node)
@@ -177,8 +179,12 @@ module ChefMetalVsphere
       end
       vm_name = provisioner_output['vm_name'] || node['name']
       vm_folder = provisioner_output['bootstrap_options']['vm_folder']
-      action_handler.perform_action "Guest shutdown and power off VM [#{vm_folder}/#{vm_name}]" do
-        stop_vm(vm_for(node))
+      vm = vm_for(node)
+
+      unless vm_stopped?(vm)
+        action_handler.perform_action "Shutdown guest OS and power off VM [#{vm_folder}/#{vm_name}]" do
+          stop_vm(vm)
+        end
       end
     end
 
@@ -198,7 +204,7 @@ module ChefMetalVsphere
       vm = find_vm(datacenter, vm_folder, vm_name)
       return vm unless vm.nil?
 
-      action_handler.perform_action "Clone a new VM instance for [#{vm_folder}/#{vm_name}]" do
+      action_handler.perform_action "Clone a new VM instance from [#{bootstrap_options['template_folder']}/#{bootstrap_options['template_name']}]" do
         vm = clone_vm(vm_name, bootstrap_options)
       end
 
@@ -215,7 +221,9 @@ module ChefMetalVsphere
     end
 
     def machine_for(node)
-      if is_windows?(vm_for(node))
+      vm = vm_for(node) or raise "VM for node #{node['name']} has not been created!"
+
+      if is_windows?(vm)
         ChefMetal::Machine::WindowsMachine.new(node, transport_for(node), convergence_strategy_for(node))
       else
         ChefMetal::Machine::UnixMachine.new(node, transport_for(node), convergence_strategy_for(node))
@@ -229,9 +237,11 @@ module ChefMetalVsphere
       vm_folder = bootstrap_options['vm_folder']
       vm_name = node['normal']['provisioner_output']['vm_name']
       vm = find_vm(datacenter, vm_folder, vm_name)
+      vm
     end
 
     def is_windows?(vm)
+      return false if vm.nil?
       vm.guest.guestFamily == 'windowsGuest'
     end
 
@@ -267,8 +277,9 @@ module ChefMetalVsphere
 
     def create_ssh_transport(node)
       bootstrap_options = node['normal']['provisioner_output']['bootstrap_options']
+      vm = vm_for(node) or raise "VM for node #{node['name']} has not been created!"
 
-      hostname = vm_for(node).guest.ipAddress
+      hostname = vm.guest.ipAddress
       ssh_user = bootstrap_options['ssh']['user']
       ssh_options = symbolize_keys(bootstrap_options['ssh'])
       transport_options = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2191173413187633211
+      hash: -1936715573261494371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2191173413187633211
+      hash: -1936715573261494371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28