bosh_vsphere_cpi 1.2640.0 → 1.2641.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3ff836bd97ee23bf158fef2e4aafd5bc6023f2
-  data.tar.gz: d5bb614b569e97721c66231ccefcfc3fed695282
+  metadata.gz: 3b2082bb5cb9b231442ac9bc874347505aa72a68
+  data.tar.gz: eb45587078b8b16f82bb717c35411b49614711e2
 SHA512:
-  metadata.gz: 2e0abfdbe4c484b47e7782224cee35421b628149faf6455530ee638747c035b14ecb8f13f7605ba551fc829de357988ea8a44983c4f79c99c2dda90154dde7db
-  data.tar.gz: 3855d4007e7dd566a0be2cde3454ddda74adde71e1005afed21f6322cb3c72a2e4f66a44020b248450557eaf710c09f41f4187922774cc0ae81560f33ebfc0cd
+  metadata.gz: c0e6a06a50283dad34b8b83fc03a647b3b16f3f2455eb08730f6fa19b8aa0b82089e231696600bad02cb8ef243a6a45c8617ef8ea5f599b9e702dd811371526e
+  data.tar.gz: 6b14f6706b27b70e4a97b9eb8c92430b2e5ef34a2797654b5e8003614e9799523db58ed847ccb334ec3cce6ab5173054a2dad4980ffd739c82bf50928c0fbfed

data/lib/cloud/vsphere/agent_env.rb

@@ -8,21 +8,35 @@ module VSphereCloud
       @file_provider = file_provider
     end
 
-    def get_current_env(location)
-      contents = @file_provider.fetch_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json")
-      contents ? JSON.load(contents) : nil
+    def get_current_env(vm, datacenter_name)
+      cdrom = @client.get_cdrom_device(vm)
+      env_iso_folder = File.dirname(cdrom.backing.file_name)
+      datastore_name = cdrom.backing.datastore.name
+      env_path = env_iso_folder.match(/\[#{datastore_name}\] (.*)/)[1]
+
+      contents = @file_provider.fetch_file(datacenter_name, datastore_name, "#{env_path}/env.json")
+      raise Bosh::Clouds::CloudError.new('Unable to load env.json') unless contents
+
+      JSON.load(contents)
     end
 
     def set_env(vm, location, env)
       env_json = JSON.dump(env)
 
-      connect_cdrom(vm, false)
+      disconnect_cdrom(vm)
+      clean_up_old_env(vm)
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.json", env_json)
       @file_provider.upload_file(location[:datacenter], location[:datastore], "#{location[:vm]}/env.iso", generate_env_iso(env_json))
-      connect_cdrom(vm, true)
+
+      datastore = @client.get_managed_object(Vim::Datastore, name: location[:datastore])
+      file_name = "[#{location[:datastore]}] #{location[:vm]}/env.iso"
+
+      update_cdrom_env(vm, datastore, file_name)
     end
 
-    def configure_env_cdrom(datastore, devices, file_name)
+    private
+
+    def update_cdrom_env(vm, datastore, file_name)
       backing_info = Vim::Vm::Device::VirtualCdrom::IsoBackingInfo.new
       backing_info.datastore = datastore
       backing_info.file_name = file_name
@@ -32,21 +46,20 @@ 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.connectable = connect_info
       cdrom.backing = backing_info
 
-      create_edit_device_spec(cdrom)
+      config = Vim::Vm::ConfigSpec.new
+      config.device_change = [create_edit_device_spec(cdrom)]
+      @client.reconfig_vm(vm, config)
     end
 
-    private
-
-    def connect_cdrom(vm, connected = true)
-      devices = @client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
-      cdrom = devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
-
-      if cdrom.connectable.connected != connected
-        cdrom.connectable.connected = connected
+    def disconnect_cdrom(vm)
+      cdrom = @client.get_cdrom_device(vm)
+      if cdrom.connectable.connected
+        cdrom.connectable.connected = false
         config = Vim::Vm::ConfigSpec.new
         config.device_change = [create_edit_device_spec(cdrom)]
         @client.reconfig_vm(vm, config)
@@ -64,6 +77,17 @@ module VSphereCloud
       end
     end
 
+    def clean_up_old_env(vm)
+      cdrom = @client.get_cdrom_device(vm)
+      return unless cdrom && cdrom.backing.respond_to?(:file_name)
+
+      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'))
+      @client.delete_path(datacenter, File.join(env_iso_folder, 'env.iso'))
+    end
+
     def which(programs)
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
         programs.each do |bin|

data/lib/cloud/vsphere/client.rb

@@ -159,7 +159,7 @@ module VSphereCloud
       task = datacenter.power_on_vm([vm], nil)
       result = wait_for_task(task)
 
-      raise "Recommendations were detected, you may be running in Manual DRS mode. Aborting." if result.recommendations.any?
+      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(', ')}"
@@ -174,9 +174,18 @@ module VSphereCloud
       wait_for_task(task)
     end
 
+    def get_cdrom_device(vm)
+      devices = get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
+      devices.find { |device| device.kind_of?(Vim::Vm::Device::VirtualCdrom) }
+    end
+
     def delete_path(datacenter, path)
       task = @service_content.file_manager.delete_file(path, datacenter)
       wait_for_task(task)
+    rescue => e
+      unless e.message =~ /File .* was not found/
+        raise e
+      end
     end
 
     def delete_disk(datacenter, path)

data/lib/cloud/vsphere/cloud.rb

@@ -238,10 +238,11 @@ module VSphereCloud
 
         # Delete env.iso and VM specific files managed by the director
         retry_block do
-          datastore = get_primary_datastore(devices)
-          datastore_name = client.get_property(datastore, Vim::Datastore, 'name')
-          vm_name = properties['name']
-          client.delete_path(datacenter, "[#{datastore_name}] #{vm_name}")
+          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)
+          end
         end
       end
     end
@@ -355,14 +356,14 @@ module VSphereCloud
         @logger.debug('Reconfiguring the networks')
         @client.reconfig_vm(vm, config)
 
-        location = get_vm_location(vm, datacenter: datacenter_name)
-        env = @agent_env.get_current_env(location)
+        env = @agent_env.get_current_env(vm, datacenter_name)
         @logger.debug("Reading current agent env: #{env.pretty_inspect}")
 
         devices = client.get_property(vm, Vim::VirtualMachine, 'config.hardware.device', ensure_all: true)
         env['networks'] = generate_network_env(devices, networks, dvs_index)
 
         @logger.debug("Updating agent env to: #{env.pretty_inspect}")
+        location = get_vm_location(vm, datacenter: datacenter_name)
         @agent_env.set_env(vm, location, env)
 
         @logger.debug('Powering the VM back on')
@@ -486,11 +487,12 @@ module VSphereCloud
         config.device_change << attached_disk_config
         fix_device_unit_numbers(devices, config.device_change)
 
-        location = get_vm_location(vm, datacenter: datacenter_name)
-        env = @agent_env.get_current_env(location)
+        env = @agent_env.get_current_env(vm, datacenter_name)
         @logger.info("Reading current agent env: #{env.pretty_inspect}")
         env['disks']['persistent'][disk.uuid] = attached_disk_config.device.unit_number.to_s
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
+
+        location = get_vm_location(vm, datacenter: datacenter_name)
         @agent_env.set_env(vm, location, env)
         @logger.info('Attaching disk')
         client.reconfig_vm(vm, config)
@@ -520,10 +522,11 @@ module VSphereCloud
         config.device_change << create_delete_device_spec(virtual_disk)
 
         location = get_vm_location(vm)
-        env = @agent_env.get_current_env(location)
+        env = @agent_env.get_current_env(vm, location[:datacenter])
         @logger.info("Reading current agent env: #{env.pretty_inspect}")
         env['disks']['persistent'].delete(disk.uuid)
         @logger.info("Updating agent env to: #{env.pretty_inspect}")
+
         @agent_env.set_env(vm, location, env)
         @logger.info('Detaching disk')
         client.reconfig_vm(vm, config)

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2640.0'
+      VERSION = '1.2641.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -77,27 +77,22 @@ module VSphereCloud
       vm = @client.wait_for_task(task)
 
       begin
-        @file_provider.upload_file(cluster.datacenter.name, datastore.name, "#{name}/env.iso", '')
-
         vm_properties = @client.get_properties(vm, VimSdk::Vim::VirtualMachine, ['config.hardware.device'], ensure_all: true)
         devices = vm_properties['config.hardware.device']
 
-        # Configure the ENV CDROM
-        config = VimSdk::Vim::Vm::ConfigSpec.new
-        config.device_change = []
-        file_name = "[#{datastore.name}] #{name}/env.iso"
-        cdrom_change = @agent_env.configure_env_cdrom(datastore.mob, devices, file_name)
-        config.device_change << cdrom_change
-        @client.reconfig_vm(vm, config)
-
         network_env = @cpi.generate_network_env(devices, networks, dvs_index)
         disk_env = @cpi.generate_disk_env(system_disk, ephemeral_disk_config.device)
         env = @cpi.generate_agent_env(name, vm, agent_id, network_env, disk_env)
         env['env'] = environment
         @logger.info("Setting VM env: #{env.pretty_inspect}")
 
-        location =
-          @cpi.get_vm_location(vm, datacenter: cluster.datacenter.name, datastore: datastore.name, vm: name)
+        location = @cpi.get_vm_location(
+          vm,
+          datacenter: cluster.datacenter.name,
+          datastore: datastore.name,
+          vm: name
+        )
+
         @agent_env.set_env(vm, location, env)
 
         @logger.info("Powering on VM: #{vm} (#{name})")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2640.0
+  version: 1.2641.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-11 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.2640.0
+        version: 1.2641.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2640.0
+        version: 1.2641.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2640.0
+        version: 1.2641.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2640.0
+        version: 1.2641.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
-  986896
+  23fe6f
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi