bosh_aws_cpi 1.2972.0 → 1.2975.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e06d17c1465acf4c2d05fe7b746b75e7835d683
-  data.tar.gz: 5ed9c3c800c500a7f07657b107de9629599d36ab
+  metadata.gz: 27920c7a1d5f41822c62323aef01a46c5e96a988
+  data.tar.gz: 3d834910c5b2187156ecbffa4b544213ae371d85
 SHA512:
-  metadata.gz: f660a88e715614d77a2e6e73385b0c5fddb662d913458690b7ea4892205519afd6eda7c92085d4111210d2da22d0b6eadac769e8e39305df6ae5b88567da6d53
-  data.tar.gz: e9ff55052f5ff610401a32c596acf6c6a63b2494e37e85c83513918eea4ee6840e21f8260654964193c9deb9e33a0f72422ab5f3879c031e6eeee68da1958d8a
+  metadata.gz: 5f2d2d7f548c8d9910e960033c65a99ff37ae906d054a0fd64fe13ee34f70e7216798b52a1c452100ba3dafccc33736f6a169c93b01eb42edd224c722dfac3cb
+  data.tar.gz: 7b3653126dec05e54b8885c73eb4af31f4fc0d8f6aec4b37d4fff35c83ed95ae48ea6487b8d16da31b2cdafcb2460016dd47f79c430b051cad253cdc491c4471

data/lib/cloud/aws/cloud.rb

@@ -190,13 +190,14 @@ module Bosh::AwsCloud
     # @return [String] created EBS volume id
     def create_disk(size, cloud_properties, instance_id = nil)
       with_thread_name("create_disk(#{size}, #{instance_id})") do
-        validate_disk_size(size)
+        type = validate_disk_type(cloud_properties.fetch('type', 'standard'))
+        validate_disk_size(type, size)
 
         # if the disk is created for an instance, use the same availability zone as they must match
         volume = @ec2.volumes.create(
           size: (size / 1024.0).ceil,
           availability_zone: @az_selector.select_availability_zone(instance_id),
-          volume_type: validate_disk_type(cloud_properties.fetch('type', 'standard')),
+          volume_type: type,
           encrypted: cloud_properties.fetch('encrypted', false)
         )
 
@@ -207,16 +208,20 @@ module Bosh::AwsCloud
       end
     end
 
-    def validate_disk_size(size)
+    def validate_disk_size(type, size)
       raise ArgumentError, 'disk size needs to be an integer' unless size.kind_of?(Integer)
 
       cloud_error('AWS CPI minimum disk size is 1 GiB') if size < 1024
-      cloud_error('AWS CPI maximum disk size is 1 TiB') if size > 1024 * 1000
+      if type == 'standard'
+        cloud_error('AWS CPI maximum disk size is 1 TiB') if size > 1024 * 1000
+      else
+        cloud_error('AWS CPI maximum disk size is 16 TiB') if size > 1024 * 16000
+      end
     end
 
     def validate_disk_type(type)
-      unless %w[gp2 standard].include?(type)
-        cloud_error('AWS CPI supports only gp2 or standard disk type')
+      unless %w[gp2 standard io1].include?(type)
+        cloud_error('AWS CPI supports only gp2, io1, or standard disk type')
       end
       type
     end

data/lib/cloud/aws/instance.rb

@@ -92,7 +92,10 @@ module Bosh::AwsCloud
     def remove_from_load_balancers
       @elb.load_balancers.each do |load_balancer|
         begin
-          load_balancer.instances.deregister(@aws_instance)
+          Bosh::Common.retryable(on: [AWS::ELB::Errors::Throttling], tries: 20) do
+            load_balancer.instances.deregister(@aws_instance)
+            true
+          end
         rescue AWS::ELB::Errors::InvalidInstance
           # ignore this, as it just means it wasn't registered
         end

data/lib/cloud/aws/instance_manager.rb

@@ -79,8 +79,8 @@ module Bosh::AwsCloud
         # address is in use - it can happen when the director recreates a VM and AWS
         # is too slow to update its state when we have released the IP address and want to
         # realocate it again.
-        errors = [AWS::EC2::Errors::InvalidIPAddress::InUse]
-        Bosh::Common.retryable(sleep: instance_create_wait_time, tries: 10, on: errors) do |tries, error|
+        errors = [AWS::EC2::Errors::InvalidIPAddress::InUse, AWS::EC2::Errors::RequestLimitExceeded]
+        Bosh::Common.retryable(sleep: instance_create_wait_time, tries: 20, on: errors) do |tries, error|
           @logger.info("Launching on demand instance...")
           @logger.warn("IP address was in use: #{error}") if tries > 0
           @region.instances.create(instance_params)

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2972.0'
+    VERSION = '1.2975.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2972.0
+  version: 1.2975.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-18 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.2972.0
+        version: 1.2975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2972.0
+        version: 1.2975.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2972.0
+        version: 1.2975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2972.0
+        version: 1.2975.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2972.0
+        version: 1.2975.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2972.0
+        version: 1.2975.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH AWS CPI
-  a6d1e9
+  a143e0
 email: support@cloudfoundry.com
 executables:
 - aws_cpi