bosh_vsphere_cpi 1.5.0.pre.1504 → 1.5.0.pre.1525

data/lib/cloud/vsphere/client.rb

@@ -155,8 +155,11 @@ module VSphereCloud
     def power_on_vm(datacenter, vm)
       task = datacenter.power_on_vm([vm], nil)
       result = wait_for_task(task)
-      if result.attempted.nil?
-        raise "Could not power on VM: #{result.not_attempted.msg}"
+
+      raise "Recommendations were detected, you may be running in Manual DRS mode. Aborting." if result.recommendations.any?
+
+      if result.attempted.empty?
+        raise "Could not power on VM: #{result.not_attempted.map(&:msg).join(', ')}"
       else
         task = result.attempted.first.task
         wait_for_task(task)

data/lib/cloud/vsphere/cloud.rb

@@ -88,6 +88,8 @@ module VSphereCloud
                                    cluster.datacenter.template_folder.mob)
           @logger.info('Waiting for NFC lease')
           state = wait_for_nfc_lease(lease)
+
+          raise_nfc_lease_error(lease) if state == Vim::HttpNfcLease::State::ERROR
           raise "Could not acquire HTTP NFC lease (state is: #{state})" unless state == Vim::HttpNfcLease::State::READY
 
           @logger.info('Uploading')
@@ -1140,5 +1142,12 @@ module VSphereCloud
 
       vms
     end
+
+    private
+
+    def raise_nfc_lease_error(lease)
+      error_message = client.get_property(lease, Vim::HttpNfcLease, 'error').msg
+      raise "Could not acquire HTTP NFC lease, message is:  #{error_message}"
+    end
   end
 end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.5.0.pre.1504'
+      VERSION = '1.5.0.pre.1525'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1504
+  version: 1.5.0.pre.1525
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH VSphere CPI
 
-  882c2b'
+  df3988'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi_console