chef-provisioning-vsphere 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38197d9fdbf4f7455ac7f5dd5f474f2e2002c9b0
-  data.tar.gz: b696a61882e2257dbac71cf51cc5ab293b0b077a
+  metadata.gz: bc055e1b2d6b786a8f6283601e4b639d8c366721
+  data.tar.gz: 055c8b542e35ac504d6e32a17fe220efcfdc2d1e
 SHA512:
-  metadata.gz: 49e7f606f483b5dc76903fc731ed219b33e47abe0d532565c4d4478e42124962b262bf01bbb7e3b183ae295107d0e93b027d1b039e99187519e34592b649bd51
-  data.tar.gz: bdb2a8cc40be87ddd07978cc329dea6bfce9e743d2d16541841fac62f2e79d8d8cec95088ac86c228fe0a3bc712e679a2bd95afc448afa8766ee858b7820c5e1
+  metadata.gz: 3de7ecf45f3b2cb52a0d56e1f0e9807f328d7268908b7519023e678fb061990aec6dbc159034e92d3a46509e3fa66ccbba23fb4eeb9b9c90e23bf2849b45de7c
+  data.tar.gz: 3df8118f086fa318d4f3bd8dbb0c1af69ffd28ce021cf61bff428f4c168e3a48f88c5c24b5374edf3c9e09709eb9bb2f96ef170d1b95b62812384a8843613846

data/README.md

@@ -11,17 +11,17 @@ chef-provisioning-vsphere supports provisioning Unix/ssh and Windows/winrm guest
 
 A vcenter and valid login credentials.
 
-### VM Teplate
+### VM Template
 
 A VM template capable of installing Chef 11.8 or newer. This can be either windows or linux flavored.
 
 ### A provisioning node (can be local)
 
-An environment equipped with the chef client and the chef-Provision-vsphere gem.
+An environment equipped with the chef client and the chef-provisioning-vsphere gem.
 
 ## A basic provisioning recipe
 
-This is a minimal machine devinition that will use a dhcp assigned ip (it assumes the presense of a dhcp server). For test purposes this uses a linked clone for a faster provisioning time. This recipe should be used with a linux template. Windows provisioned servers need to point to a chef server for the cookbooks since winrm does not support port forwarding and there fore cannot reach back on the chef-zero port to get the local cookbooks. See examples below.
+This is a minimal machine definition that will use a dhcp assigned ip (it assumes the presense of a dhcp server). For test purposes this uses a linked clone for a faster provisioning time. This recipe should be used with a linux template. Windows provisioned servers need to point to a chef server for the cookbooks since winrm does not support port forwarding and there fore cannot reach back on the chef-zero port to get the local cookbooks. See examples below.
 
 ```
 chef_gem 'chef-provisioning-vsphere' do
@@ -135,14 +135,12 @@ with_machine_options :bootstrap_options => {
 
 ### Domain joined windows machine
 
-Note: You must run chef-client against a server for a windows box. You cn do this locally since the provisioning recipe should not change the state of the provisioner. You will need to upload the cookbook (both the one doing the provisioning and the one used in the provisioned machine's runlist) before running `chef-client`.
-
 ```
 with_machine_options :bootstrap_options => {
   use_linked_clone: true,
   num_cpus: 2,
   memory_mb: 4096,
-  network_name: ["vlan_20_172.21.20"],
+  network_name: ['vlan_20_172.21.20'],
   datacenter: 'datacenter_name',
   resource_pool: 'cluster',
   template_name: 'path to template',
@@ -150,20 +148,29 @@ with_machine_options :bootstrap_options => {
     ipsettings: {
       dnsServerList: ['1.2.3.31','1.2.3.41']
     },
-    domain => 'blah.com',
-    domainAdmin => "administrator@blah.com",
-    domainAdminPassword => "Passwordyoyoyo",
-    org_name => 'acme',
-    product_id => 'CDAA-87DC-3455-FF77-2AAC',
-    win_time_zone => 4
+    domain: 'blah.com',
+    domainAdmin: 'administrator@blah.com',
+    domainAdminPassword: 'Passwordyoyoyo',
+    org_name: 'acme',
+    product_id: 'CDAA-87DC-3455-FF77-2AAC',
+    win_time_zone: 4
   }
-  :ssh => {
-    :user => 'administrator',
-    :password => 'password',
-    :paranoid => false,
+  ssh: {
+    user: 'administrator',
+    password: 'password',
+    paranoid: false,
   }
+},
+:convergence_options => {
+  :ssl_verify_mode => :verify_none
 }
 ```
+Note: You must run chef-client against a server for a windows box. You can do this locally since the provisioning recipe should not change the state of the provisioner. You will need to upload the cookbook (both the one doing the provisioning and the one used in the provisioned machine's runlist) before running `chef-client`.
+
+```
+knife cookbook upload my_cookbook
+chef-client -o 'my_cookbook::provision' -c .chef/knife.rb
+```
 
 ## Kitchen Driver
 

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

@@ -292,7 +292,7 @@ module ChefProvisioningVsphere
             vm.config.instanceUuid,
             'started but SSH did not come up.  Rebooting...'
           ))
-          restart_server(action_handler, machine_spec, vm)
+          restart_server(action_handler, machine_spec, machine_options)
           wait_until_ready(action_handler, machine_spec, machine_options, vm)
           wait_for_transport(action_handler, machine_spec, machine_options, vm)
         end
@@ -315,7 +315,7 @@ module ChefProvisioningVsphere
           action_handler.report_progress(msg.join)
           start_vm(vm)
         else
-          restart_server(action_handler, machine_spec, vm)
+          restart_server(action_handler, machine_spec, machine_options)
         end
         wait_for_ip(vm, machine_options, action_handler)
       end
@@ -411,10 +411,10 @@ module ChefProvisioningVsphere
       vm
     end
 
-    def restart_server(action_handler, machine_spec, vm)
+    def restart_server(action_handler, machine_spec, machine_options)
       action_handler.perform_action "restart machine #{machine_spec.name} (#{vm.config.instanceUuid} on #{driver_url})" do
-        stop_machine(action_handler, machine_spec, vm)
-        start_vm(vm)
+        stop_machine(action_handler, machine_spec, machine_options)
+        start_machine(action_handler, machine_spec, machine_options)
         machine_spec.location['started_at'] = Time.now.utc.to_s
       end
     end

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

@@ -1,3 +1,3 @@
 module ChefProvisioningVsphere
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - CenturyLink Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi