chef-provisioning-vsphere 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a4045ecb221ec02220b2e3c0849e97cf1bb1c57
-  data.tar.gz: 23dde05998a38c711916deb319f5b98ae506daba
+  metadata.gz: 447c1e20f65a8624c0321e979bd167d749bfdc99
+  data.tar.gz: 0d2642fb145e478ed4bb941463ac918eae3b5e3d
 SHA512:
-  metadata.gz: ac9cedbb382f9d21793a70d29f41937fee9abf36fb080fa7a888203d65a1e0f693b05cae3c2006a62ec976dc8391fe0dc67c65a27d358d51c6237f2ec8d2ff6a
-  data.tar.gz: 4327d561d58097f0abeb4d254b9bdfefd024784f784860617317253cbf2fa091722e0637e4a85df5bfd46e95621db89ad12719f432dae72d02e80aacfa7dea93
+  metadata.gz: 819875ac593906e1d8570f823471d05747baa54ef9689086de8aee21cc093c7df87cee7835618590b8a585d87ba764028a7d96fc8e2f69559be8fceea4825d96
+  data.tar.gz: 702b9dcd0d2c953cd5034a03ae70e6706c48eb58af12076b8c10ba32e6b2fc5ee5debaa376081e664d7c2bb64f0504968b43d7670fc6247cec98b2d8431e89c5

data/README.md

@@ -93,7 +93,7 @@ This will use chef-zero and needs no chef server (only works for ssh). Note that
 - `[:convergence_options][:install_sh_url]` - the bach script to install chef client on linux (defaults to latest)
 - `[:customization_spec][:ipsettings][:ip]` static ip to assign to machine
 - `[:customization_spec][:ipsettings][:subnetMask]` - subnet to use
-- `[:customization_spec][:ipsettings][:gateway]` - gateway to use
+- `[:customization_spec][:ipsettings][:gateway]` - array of possible gateways to use (this will most often be an array of 1)
 - `[:customization_spec][:ipsettings][:dnsServerList]` - array of DNS servers to use
 - `[:customization_spec][:domain]` - domain to use (if not 'local' on a windows machine it will attempt to domain join)
 - `[:customization_spec][:domainAdmin]` - domain admin account to use for domain join on windows (should be `{user name}`@`{domain}`)
@@ -180,6 +180,48 @@ knife cookbook upload my_cookbook
 chef-client -o 'my_cookbook::provision' -c .chef/knife.rb
 ```
 
+### Prefix all SSH commands with 'sudo ', for installing on hosts where options[:bootstrap_options][:ssh][:user] is not 'root'. The user must have 'NOPASSWD:ALL' in /etc/sudoers. This is compatible with chef-provisioning-fog functionality
+
+```
+chef_gem 'chef-provisioning-vsphere' do
+  action :install
+  compile_time true
+end
+
+require 'chef/provisioning/vsphere_driver'
+
+with_vsphere_driver host: 'vcenter-host-name',
+  insecure: true,
+  user:     'you_user_name',
+  password: 'your_mothers_maiden_name'
+
+with_machine_options :bootstrap_options => {
+  use_linked_clone: true,
+  num_cpus: 2,
+  memory_mb: 4096,
+  network_name: ["vlan_20_172.21.20"],
+  datacenter: 'datacenter_name',
+  resource_pool: 'cluster',
+  template_name: 'path to template',
+  customization_spec: {
+    ipsettings: {
+      dnsServerList: ['1.2.3.31','1.2.3.41']
+    },
+    :domain => 'local'
+  }
+  :ssh => {
+    :user => 'root',
+    :password => 'password',
+    :paranoid => false,
+  }
+},
+:sudo => true
+
+machine "my_machine_name" do
+  run_list ['my_cookbook::default']
+end
+
+```
 ## Kitchen Driver
 
 This chef-provisioning-driver comes with a test-kitchen driver. Here are example driver options you can add to your `kitchen.yml`.

data/lib/chef/provisioning/vsphere_driver/driver.rb

@@ -379,7 +379,7 @@ module ChefProvisioningVsphere
       if vm
         action_handler.perform_action "Delete VM [#{vm.parent.name}/#{vm.name}]" do
           begin
-            vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == 'poweredOff'
+            vsphere_helper.stop_vm(vm, machine_options[:stop_timeout])
             vm.Destroy_Task.wait_for_completion
           rescue RbVmomi::Fault => fault
             raise fault unless fault.fault.class.wsdl_name == "ManagedObjectNotFound"
@@ -397,7 +397,7 @@ module ChefProvisioningVsphere
       vm = vm_for(machine_spec)
       if vm
         action_handler.perform_action "Shutdown guest OS and power off VM [#{vm.parent.name}/#{vm.name}]" do
-          vsphere_helper.stop_vm(vm)
+          vsphere_helper.stop_vm(vm, machine_options[:stop_timeout])
         end
       end
     end
@@ -638,7 +638,7 @@ module ChefProvisioningVsphere
         host,
         ssh_user,
         options,
-        {},
+        @config[:machine_options][:sudo] ? {:prefix => 'sudo '} : {},
         config
       )
     end

data/lib/chef/provisioning/vsphere_driver/version.rb

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb

@@ -47,13 +47,6 @@ module ChefProvisioningVsphere
       )
     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'
@@ -61,10 +54,15 @@ module ChefProvisioningVsphere
       end
     end
 
-    def stop_vm(vm)
+    def stop_vm(vm, timeout = 600)
+        start = Time.now.utc
       begin
         vm.ShutdownGuest
-        sleep 2 until vm.runtime.powerState == 'poweredOff'
+        until (Time.now.utc - start) > timeout ||
+          vm.runtime.powerState == 'poweredOff' do
+            print '.'
+            sleep 2
+        end
       rescue
         vm.PowerOffVM_Task.wait_for_completion
       end

data/lib/kitchen/driver/vsphere.rb

@@ -12,6 +12,7 @@ module Kitchen
       default_config :machine_options,
         :start_timeout => 600,
         :create_timeout => 600,
+        :stop_timeout => 600,
         :ready_timeout => 90,
         :bootstrap_options => {
           :use_linked_clone => true,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi