bosh_aws_cpi 1.3048.0 → 1.3050.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a895181be5fda7b597ac103cea1ab79c789642eb
-  data.tar.gz: 411995eed5826fe564c188c58bb85d849df33d9c
+  metadata.gz: 91a6ffeeb7121c9fd177a2b0dd355642b695832d
+  data.tar.gz: f237a99b854f437513f636636249421678aefb56
 SHA512:
-  metadata.gz: f67601a12ccff2629aa3692b10b793e2ef5dfe03ff6b89b313149513df8a45e9157f471cc103a49890b45e327818bac78693ffc6486fa5187dfe4d46207867a3
-  data.tar.gz: bb5fb0ca52bd027c713aa6376f4ed4553b8c4e52b884b80b69041bf35be981caf3ac0ca7a6063cb9f65405925839fb9ab0c39d3468eaee877b4c7f552967cb61
+  metadata.gz: b26df12a6cc945d231c6c0f1d0f00af09d639a28b6142faea021a31ea1b556a4163ccda7c9d84f3941a8cb015a132386e27979190e4e9cde23bde9714db4f274
+  data.tar.gz: 4c1185efa9b629fe42b0bc14808666b2501a9ea77135610b5ce76bf174c6a611f7f7e4c34ce43ae80cce59c7ba4766418268bdddfc4a2b26789fc28b1587932a

data/bin/aws_cpi

@@ -6,15 +6,20 @@ require 'bosh/cpi'
 require 'bosh/cpi/cli'
 
 cpi_config = YAML.load_file(ARGV.shift)
-
 cloud_config = OpenStruct.new(:logger => Logger.new(STDERR))
 
 Bosh::Clouds::Config.configure(cloud_config)
 
-cloud_properties = cpi_config['cloud']['properties']
-
-cpi = Bosh::Clouds::Aws.new(cloud_properties)
 cpi_log = StringIO.new # Empty on AWS
-cli = Bosh::Cpi::Cli.new(cpi, cpi_log, STDOUT)
 
-cli.run(ARGF.read)
+cpi_lambda = lambda do
+  unless cpi_config.has_key?('cloud') && cpi_config['cloud'].has_key?('properties')
+    raise "Could not find cloud properties in the configuration"
+  end
+  cloud_properties = cpi_config['cloud']['properties']
+  Bosh::Clouds::Aws.new(cloud_properties)
+end
+
+cli = Bosh::Cpi::Cli.new(cpi_lambda, cpi_log, STDOUT)
+
+cli.run(ARGF.read)

data/lib/cloud/aws/cloud.rb

@@ -226,6 +226,18 @@ module Bosh::AwsCloud
       type
     end
 
+    ##
+    # Check whether an OpenStack volume exists or not
+    #
+    # @param [String] disk_id OpenStack volume UUID
+    # @return [bool] whether the specific disk is there or not
+    def has_disk?(disk_id)
+      with_thread_name("has_disk?(#{disk_id})") do
+        @logger.info("Check the presence of disk with id `#{disk_id}'...")
+        @ec2.volumes[disk_id].exists?
+      end
+    end
+
     ##
     # Delete EBS volume
     # @param [String] disk_id EBS volume id
@@ -304,14 +316,18 @@ module Bosh::AwsCloud
         instance = @ec2.instances[instance_id]
         volume = @ec2.volumes[disk_id]
 
+        if volume.exists?
+          detach_ebs_volume(instance, volume)
+        else
+          @logger.info("Disk `#{disk_id}' not found while trying to detach it from vm `#{instance_id}'...")
+        end
+
         update_agent_settings(instance) do |settings|
           settings["disks"] ||= {}
           settings["disks"]["persistent"] ||= {}
           settings["disks"]["persistent"].delete(disk_id)
         end
 
-        detach_ebs_volume(instance, volume)
-
         logger.info("Detached `#{disk_id}' from `#{instance_id}'")
       end
     end

data/lib/cloud/aws/instance_manager.rb

@@ -111,6 +111,8 @@ module Bosh::AwsCloud
       ephemeral_disk_options = resource_pool.fetch("ephemeral_disk", {})
       ephemeral_disk_options["instance_type"] = resource_pool["instance_type"]
       instance_params[:block_device_mappings] = block_device_mapping(ephemeral_disk_options)
+      instance_params[:placement_group] = resource_pool["placement_group"] if resource_pool["placement_group"]
+      instance_params[:dedicated_tenancy] = true if resource_pool["tenancy"] == "dedicated"
 
       set_user_data_parameter(instance_params, networks_spec)
       set_key_name_parameter(instance_params, resource_pool["key_name"], options["aws"]["default_key_name"])

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.3048.0'
+    VERSION = '1.3050.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3050.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH AWS CPI
-  e2c11a
+  b92cdc
 email: support@cloudfoundry.com
 executables:
 - aws_cpi