bosh_vsphere_cpi 1.2669.0 → 1.2671.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b905d442926f14b403ad97e072a617794d8a88
-  data.tar.gz: a66362d5da3c75a9c66bbd291c8d9e9e48823d78
+  metadata.gz: 61fe7694316b32f7754a050430807d0e494a8cd4
+  data.tar.gz: 8f1613cd5d4c197e1349aa292fba39781caebb81
 SHA512:
-  metadata.gz: 69b57b9add6e647acb311abd238325d9c1b01d2bd978a5866f497bda4c832bd4091a294f9b97cc1aa6e93b27b4f28a9c1314d818f838333e3f3860a294fac889
-  data.tar.gz: 10822a03ca17fec0899f22345d563a842e716c7dec0cce8c3fa214ca74611d44af5d493056c49faadedc641060b7794e6d8b4287d059ad1bc2cfd725a4fa8c1a
+  metadata.gz: df097b72c016f06b3c49871603d15df7a383bf9f32ff522226d04cb91cd3c518ae1d0d0b6b23710685933d079d916f7dd17c3577fdcca0d44c65e859b13022b9
+  data.tar.gz: af36fb7f81b6e45a65d7c97edbe1f47ad99c45a1badae540b15611ad4ab9bf808c5c04c79ba4f5e685774356b4a5728080d6d1fb0ab605134a2c47067290cf1a

data/lib/cloud/vsphere/cloud.rb

@@ -311,24 +311,17 @@ module VSphereCloud
         vm = get_vm_by_cid(vm_cid)
 
         @logger.debug('Waiting for the VM to shutdown')
-        state = :initial
         begin
-          wait_until_off(vm, 30)
-        rescue TimeoutException
-          case state
-            when :initial
-              @logger.debug('The guest did not shutdown in time, requesting it to shutdown')
-              begin
-                vm.shutdown_guest
-              rescue => e
-                @logger.debug("Ignoring possible race condition when a VM has powered off by the time we ask it to shutdown: #{e.message}")
-              end
-              state = :shutdown_guest
-              retry
-            else
-              @logger.error('The guest did not shutdown in time, even after a request')
-              raise
+          begin
+            vm.shutdown_guest
+          rescue => e
+            @logger.debug("Ignoring possible race condition when a VM has powered off by the time we ask it to shutdown: #{e.message}")
           end
+
+          wait_until_off(vm, 60)
+        rescue TimeoutException
+          @logger.debug('The guest did not shutdown in time, requesting it to power off')
+          client.power_off_vm(vm)
         end
 
         @logger.info("Configuring: #{vm_cid} to use the following network settings: #{networks.pretty_inspect}")

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2669.0'
+      VERSION = '1.2671.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2669.0
+  version: 1.2671.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2669.0
+        version: 1.2671.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2669.0
+        version: 1.2671.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2669.0
+        version: 1.2671.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2669.0
+        version: 1.2671.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: 2.4.0
 description: |-
   BOSH VSphere CPI
-  bf0b96
+  03191d
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi