bosh_vsphere_cpi 1.2652.0 → 1.2657.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34426aaeb73b4a463810d492dbd6c17d7a9ec67
-  data.tar.gz: 389890d9aab67d3e5009edf679ab9872ae614324
+  metadata.gz: 830117bfa34478cf66609ad0662380755df39663
+  data.tar.gz: e6e5313e6199ac88a496eaf433f7cd455ec6e556
 SHA512:
-  metadata.gz: a53a6f593ecc93a495afff7a8b9c6bcaf99bde0ebb11808ef9142078114461db42425b413c7ae15fe582188af566b41a56b0ea4e97c8a7028a7540c1a13b4d15
-  data.tar.gz: f6d4df0690286cfc8ea32597ba73ebc0ef8a36d61294777bf1e49665ba9b28cda4ac62c001db0def8280c8934969a449df34ebd2e63baa0ef66a9c6a9b17aa75
+  metadata.gz: 5d92517dd6042aea7c2a0a851f46969e082b74cbc589ef2be178388c9c2a7dac818825c3e7d3fdbda0fee2f804a7ebcb675656addaa9dd48fd0197be4ba3a507
+  data.tar.gz: 779f2888b44a23173adb147a1cc921c2a37664e0323d8d86095a75b8214703dd0734859a49cd45261e15cc6d4bd95234df7cd0243ef473f941303f0b21a170dc

data/lib/cloud/vsphere/agent_env.rb

@@ -10,7 +10,9 @@ module VSphereCloud
 
     def get_current_env(vm, datacenter_name)
       cdrom = @client.get_cdrom_device(vm)
-      env_iso_folder = File.dirname(cdrom.backing.file_name)
+      env_iso_folder = env_iso_folder(cdrom)
+      return unless env_iso_folder
+
       datastore_name = cdrom.backing.datastore.name
       env_path = env_iso_folder.match(/\[#{datastore_name}\] (.*)/)[1]
 
@@ -34,6 +36,11 @@ module VSphereCloud
       update_cdrom_env(vm, datastore, file_name)
     end
 
+    def env_iso_folder(cdrom_device)
+      return unless cdrom_device && cdrom_device.backing.respond_to?(:file_name)
+      File.dirname(cdrom_device.backing.file_name)
+    end
+
     private
 
     def update_cdrom_env(vm, datastore, file_name)
@@ -46,8 +53,7 @@ module VSphereCloud
       connect_info.start_connected = true
       connect_info.connected = true
 
-      devices = vm.config.hardware.device
-      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
+      cdrom = @client.get_cdrom_device(vm)
       cdrom.connectable = connect_info
       cdrom.backing = backing_info
 
@@ -79,9 +85,9 @@ module VSphereCloud
 
     def clean_up_old_env(vm)
       cdrom = @client.get_cdrom_device(vm)
-      return unless cdrom && cdrom.backing.respond_to?(:file_name)
+      env_iso_folder = env_iso_folder(cdrom)
+      return unless env_iso_folder
 
-      env_iso_folder = File.dirname(cdrom.backing.file_name)
       datacenter = @client.find_parent(vm, Vim::Datacenter)
 
       @client.delete_path(datacenter, File.join(env_iso_folder, 'env.json'))

data/lib/cloud/vsphere/cloud.rb

@@ -238,10 +238,12 @@ module VSphereCloud
 
         # Delete env.iso and VM specific files managed by the director
         retry_block do
-          cdrom_device = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
-          if cdrom_device
-            env_iso_folder = File.dirname(cdrom_device.backing.file_name)
-            client.delete_path(datacenter, env_iso_folder)
+          cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
+          if cdrom
+            env_iso_folder = @agent_env.env_iso_folder(cdrom)
+            if env_iso_folder
+              client.delete_path(datacenter, env_iso_folder)
+            end
           end
         end
       end

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2652.0'
+      VERSION = '1.2657.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2652.0
+  version: 1.2657.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-24 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.2652.0
+        version: 1.2657.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: 2.2.4
 description: |-
   BOSH VSphere CPI
-  43d2e8
+  a6c527
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi