bosh_aws_cpi 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b0fde31ccef32f21fe160d8e6ae7be77368530
-  data.tar.gz: e3b8224c4f39a0d63b64baf7efdb6b9dcc3e8d8c
+  metadata.gz: ab03ce5aecf1e03ddb369df4a0906dda5b5d16fd
+  data.tar.gz: 673d0abaf1b22ea61797c997b70fdae0608ff24c
 SHA512:
-  metadata.gz: 73e29668c5edcb7e6c2101d040cafb22947262397e2976175b40bce7f38fe9d174deccc52a3550aa4c9a5cd2fa325881e9a84a99271cdc88217d27277566fc45
-  data.tar.gz: fa984ef1fa766aa9945260e513781846e71957fabcebcde03e0249e8a9582641b2bb6912f296eb81706bff5e371d15659073f8eb3b19d662111fba1bf7f19a58
+  metadata.gz: be78232ecfe2fb479b23ab635571050c9f33609e060dd0f63d45a78a2615b648e93161294afb652442ac6d40de049d6c3d33b23eeb3eb43ff973025bd05d452d
+  data.tar.gz: 5c86071d7c35194024548bab7d07c8e373b188ffe69dc7d7008584bac283d14625adbf865383faa0b8b2a5629c00e6f98d3d41a573dcf0a7d62e4f92c0d95de8

data/lib/cloud/aws.rb

@@ -36,6 +36,9 @@ require "cloud/aws/spot_manager"
 require "cloud/aws/tag_manager"
 require "cloud/aws/availability_zone_selector"
 require "cloud/aws/resource_wait"
+require "cloud/aws/volume_properties"
+require "cloud/aws/volumes_create_presenter"
+require "cloud/aws/instances_create_presenter"
 
 module Bosh
   module Clouds

data/lib/cloud/aws/availability_zone_selector.rb

@@ -10,10 +10,8 @@ module Bosh::AwsCloud
     def common_availability_zone(volume_az_names, resource_pool_az_name, vpc_subnet_az_name)
       zone_names = (volume_az_names + [resource_pool_az_name, vpc_subnet_az_name]).compact.uniq
       if zone_names.size > 1
-        raise Bosh::Clouds::CloudError,
-          "can't use multiple availability zones: Volume in #{volume_az_names.join(', ')}, " +
-              "Resource Pool in #{resource_pool_az_name}, " +
-              "Subnet in #{vpc_subnet_az_name}"
+        volume_az_error_string = ", and volume in #{volume_az_names.join(', ')}" unless volume_az_names.empty?
+        raise Bosh::Clouds::CloudError, "can't use multiple availability zones: subnet in #{vpc_subnet_az_name}, VM in #{resource_pool_az_name}#{volume_az_error_string}"
       end
 
       zone_names.first || @default

data/lib/cloud/aws/cloud.rb

@@ -1,8 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
 require 'cloud/aws/stemcell_finder'
 
 module Bosh::AwsCloud
-
   class Cloud < Bosh::Cloud
     include Helpers
 
@@ -33,8 +31,6 @@ module Bosh::AwsCloud
       @aws_params = {
         credentials_source: aws_properties['credentials_source'] || 'static',
         region:            aws_properties['region'],
-        ec2_endpoint:      aws_properties['ec2_endpoint'] || default_ec2_endpoint,
-        elb_endpoint:      aws_properties['elb_endpoint'] || default_elb_endpoint,
         max_retries:       aws_properties['max_retries']  || DEFAULT_MAX_RETRIES,
         logger:            aws_logger
       }
@@ -156,10 +152,6 @@ module Bosh::AwsCloud
       end
     end
 
-    def default_elb_endpoint
-      ['elasticloadbalancing', aws_region, 'amazonaws.com'].compact.join('.')
-    end
-
     ##
     # Delete EC2 instance ("terminate" in AWS language) and wait until
     # it reports as terminated
@@ -196,17 +188,20 @@ module Bosh::AwsCloud
     #        of the VM that this disk will be attached to
     # @return [String] created EBS volume id
     def create_disk(size, cloud_properties, instance_id = nil)
+      raise ArgumentError, 'disk size needs to be an integer' unless size.kind_of?(Integer)
       with_thread_name("create_disk(#{size}, #{instance_id})") do
-        type = validate_disk_type(cloud_properties.fetch('type', 'standard'))
-        validate_disk_size(type, size)
+        volume_properties = VolumeProperties.new(
+          size: size,
+          type: cloud_properties['type'],
+          iops: cloud_properties['iops'],
+          az: @az_selector.select_availability_zone(instance_id),
+          encrypted: cloud_properties['encrypted']
+        )
+        volume_properties.validate!
 
         # 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: type,
-          encrypted: cloud_properties.fetch('encrypted', false)
-        )
+        with_volume_options = VolumesCreatePresenter.new(volume_properties).present
+        volume = @ec2.volumes.create(with_volume_options)
 
         logger.info("Creating volume '#{volume.id}'")
         ResourceWait.for_volume(volume: volume, state: :available)
@@ -215,28 +210,10 @@ module Bosh::AwsCloud
       end
     end
 
-    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
-      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 io1].include?(type)
-        cloud_error('AWS CPI supports only gp2, io1, or standard disk type')
-      end
-      type
-    end
-
     ##
-    # Check whether an OpenStack volume exists or not
+    # Check whether an EBS volume exists or not
     #
-    # @param [String] disk_id OpenStack volume UUID
+    # @param [String] disk_id EBS 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
@@ -313,6 +290,9 @@ module Bosh::AwsCloud
         end
         logger.info("Attached `#{disk_id}' to `#{instance_id}'")
       end
+
+      # log registry settings for debugging
+      logger.debug("updated registry settings: #{registry.read_settings(instance_id)}")
     end
 
     # Detach an EBS volume from an EC2 instance
@@ -523,7 +503,13 @@ module Bosh::AwsCloud
       instance = @ec2.instances[vm]
 
       metadata.each_pair do |key, value|
-        TagManager.tag(instance, key, value)
+        TagManager.tag(instance, key, value) unless key == 'name'
+      end
+
+      name = metadata['name']
+      if name
+        TagManager.tag(instance, "Name", name)
+        return
       end
 
       job = metadata['job']
@@ -559,11 +545,6 @@ module Bosh::AwsCloud
     attr_reader :az_selector
     attr_reader :region
 
-    def default_ec2_endpoint
-      region_suffix = (aws_region && aws_region.start_with?('cn')) ? 'cn' : nil
-      ['ec2', aws_region, 'amazonaws.com', region_suffix].compact.join('.')
-    end
-
     def agent_properties
       @agent_properties ||= options.fetch('agent', {})
     end
@@ -585,8 +566,12 @@ module Bosh::AwsCloud
       # @ec2.regions[] does not properly set the endpoint on the region (bug in /aws/ec2/region_collection.rb)
       # It just returns a Region object with nothing set but the name.
       # As a workaround use the 'each' method, which is implemented correctly
-      @region = @ec2.regions.select {|r| r.name == aws_region}.first
-      @az_selector = AvailabilityZoneSelector.new(@region, aws_properties['default_availability_zone'])
+      begin
+        @region = @ec2.regions.select {|r| r.name == aws_region}.first
+        @az_selector = AvailabilityZoneSelector.new(@region, aws_properties['default_availability_zone'])
+      rescue Net::OpenTimeout => e
+        cloud_error("Please make sure the CPI has proper network access to AWS. #{e.inspect}")
+      end
     end
 
     def initialize_registry

data/lib/cloud/aws/helpers.rb

@@ -1,28 +1,25 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::AwsCloud
 
   module Helpers
     def default_ephemeral_disk_mapping
-      [
-        {
-          device_name: '/dev/sdb',
-          virtual_name: 'ephemeral0',
-        }
-      ]
+       [
+         {
+           :device_name => '/dev/sdb',
+           :virtual_name => 'ephemeral0',
+         },
+       ]
     end
 
-    def ebs_ephemeral_disk_mapping(volume_size_in_gb, volume_type)
-      [
-        {
-          device_name: '/dev/sdb',
-          ebs: {
-            volume_size: volume_size_in_gb,
-            volume_type: volume_type,
-            delete_on_termination: true,
-          },
-        },
-      ]
+    def ebs_ephemeral_disk_mapping(volume_size_in_gb, volume_type, iops = nil)
+      ebs = {
+        volume_size: volume_size_in_gb,
+        volume_type: volume_type,
+        delete_on_termination: true,
+      }
+
+      ebs[:iops] = iops if iops
+
+      [{device_name: '/dev/sdb', ebs: ebs}]
     end
 
     ##

data/lib/cloud/aws/instance_manager.rb

@@ -7,6 +7,7 @@ module Bosh::AwsCloud
 
     class DiskInfo
       attr_reader :size, :count
+
       def initialize(size, count)
         @size = size
         @count = count
@@ -14,59 +15,59 @@ module Bosh::AwsCloud
     end
 
     InstanceStorageMap = {
-        # previous generation
-        'm1.small' => DiskInfo.new(160, 1),
-        'm1.medium' => DiskInfo.new(410, 1),
-        'm1.large' => DiskInfo.new(420, 2),
-        'm1.xlarge' => DiskInfo.new(420, 4),
+      # previous generation
+      'm1.small' => DiskInfo.new(160, 1),
+      'm1.medium' => DiskInfo.new(410, 1),
+      'm1.large' => DiskInfo.new(420, 2),
+      'm1.xlarge' => DiskInfo.new(420, 4),
 
-        'c1.medium' => DiskInfo.new(350, 1),
-        'c1.xlarge' => DiskInfo.new(420, 4),
+      'c1.medium' => DiskInfo.new(350, 1),
+      'c1.xlarge' => DiskInfo.new(420, 4),
 
-        'cc2.8xlarge' => DiskInfo.new(840, 4),
+      'cc2.8xlarge' => DiskInfo.new(840, 4),
 
-        'cg1.4xlarge' => DiskInfo.new(840, 2),
+      'cg1.4xlarge' => DiskInfo.new(840, 2),
 
-        'm2.xlarge' => DiskInfo.new(420, 1),
-        'm2.2xlarge' => DiskInfo.new(850, 1),
-        'm2.4xlarge' => DiskInfo.new(840, 2),
+      'm2.xlarge' => DiskInfo.new(420, 1),
+      'm2.2xlarge' => DiskInfo.new(850, 1),
+      'm2.4xlarge' => DiskInfo.new(840, 2),
 
-        'cr1.8xlarge' => DiskInfo.new(120, 2),
+      'cr1.8xlarge' => DiskInfo.new(120, 2),
 
-        'hi1.4xlarge' => DiskInfo.new(1024, 2),
+      'hi1.4xlarge' => DiskInfo.new(1024, 2),
 
-        'hs1.8xlarge' => DiskInfo.new(2000, 24),
+      'hs1.8xlarge' => DiskInfo.new(2000, 24),
 
-        # current generation
-        'm3.medium' => DiskInfo.new(4, 1),
-        'm3.large' => DiskInfo.new(32, 1),
-        'm3.xlarge' => DiskInfo.new(40, 2),
-        'm3.2xlarge' => DiskInfo.new(80, 2),
+      # current generation
+      'm3.medium' => DiskInfo.new(4, 1),
+      'm3.large' => DiskInfo.new(32, 1),
+      'm3.xlarge' => DiskInfo.new(40, 2),
+      'm3.2xlarge' => DiskInfo.new(80, 2),
 
-        'c3.large' => DiskInfo.new(16, 2),
-        'c3.xlarge' => DiskInfo.new(40, 2),
-        'c3.2xlarge' => DiskInfo.new(80, 2),
-        'c3.4xlarge' => DiskInfo.new(160, 2),
-        'c3.8xlarge' => DiskInfo.new(320, 2),
+      'c3.large' => DiskInfo.new(16, 2),
+      'c3.xlarge' => DiskInfo.new(40, 2),
+      'c3.2xlarge' => DiskInfo.new(80, 2),
+      'c3.4xlarge' => DiskInfo.new(160, 2),
+      'c3.8xlarge' => DiskInfo.new(320, 2),
 
-        'r3.large' => DiskInfo.new(32, 1),
-        'r3.xlarge' => DiskInfo.new(80, 1),
-        'r3.2xlarge' => DiskInfo.new(160, 1),
-        'r3.4xlarge' => DiskInfo.new(320, 1),
-        'r3.8xlarge' => DiskInfo.new(320, 2),
+      'r3.large' => DiskInfo.new(32, 1),
+      'r3.xlarge' => DiskInfo.new(80, 1),
+      'r3.2xlarge' => DiskInfo.new(160, 1),
+      'r3.4xlarge' => DiskInfo.new(320, 1),
+      'r3.8xlarge' => DiskInfo.new(320, 2),
 
-        'g2.2xlarge' => DiskInfo.new(60, 1),
-        'g2.8xlarge' => DiskInfo.new(120, 2),
+      'g2.2xlarge' => DiskInfo.new(60, 1),
+      'g2.8xlarge' => DiskInfo.new(120, 2),
 
-        'i2.xlarge' => DiskInfo.new(800, 1),
-        'i2.2xlarge' => DiskInfo.new(800, 2),
-        'i2.4xlarge' => DiskInfo.new(800, 4),
-        'i2.8xlarge' => DiskInfo.new(800, 8),
+      'i2.xlarge' => DiskInfo.new(800, 1),
+      'i2.2xlarge' => DiskInfo.new(800, 2),
+      'i2.4xlarge' => DiskInfo.new(800, 4),
+      'i2.8xlarge' => DiskInfo.new(800, 8),
 
-        'd2.xlarge' => DiskInfo.new(2000, 3),
-        'd2.2xlarge' => DiskInfo.new(2000, 6),
-        'd2.4xlarge' => DiskInfo.new(2000, 12),
-        'd2.8xlarge' => DiskInfo.new(2000, 24)
+      'd2.xlarge' => DiskInfo.new(2000, 3),
+      'd2.2xlarge' => DiskInfo.new(2000, 6),
+      'd2.4xlarge' => DiskInfo.new(2000, 12),
+      'd2.8xlarge' => DiskInfo.new(2000, 24)
     }
 
     def initialize(region, registry, elb, az_selector, logger)
@@ -82,7 +83,7 @@ module Bosh::AwsCloud
 
       @logger.info("Creating new instance with: #{instance_params.inspect}")
 
-      aws_instance = create_aws_instance(instance_params, resource_pool["spot_bid_price"])
+      aws_instance = create_aws_instance(instance_params, resource_pool)
 
       instance = Instance.new(aws_instance, @registry, @elb, @logger)
 
@@ -102,9 +103,9 @@ module Bosh::AwsCloud
       end
 
       block_device_agent_info = block_device_info
-                                    .group_by { |v| v[:bosh_type] }
-                                    .map { |type, devices| {type => devices.map { |device| {"path" => device[:device_name] }}}}
-                                    .inject({}) { |a, b| a.merge(b) }
+                                  .group_by { |v| v[:bosh_type] }
+                                  .map { |type, devices| {type => devices.map { |device| {"path" => device[:device_name]} }} }
+                                  .inject({}) { |a, b| a.merge(b) }
 
       return instance, block_device_agent_info
     end
@@ -123,7 +124,7 @@ module Bosh::AwsCloud
       instance_params = {count: 1}
       instance_params[:image_id] = stemcell_id
       instance_params[:instance_type] = resource_pool["instance_type"]
-      instance_params[:block_device_mappings] = block_device_info.map { |entry| entry.reject{ |k| k == :bosh_type } }
+      instance_params[:block_device_mappings] = block_device_info.map { |entry| entry.reject { |k| k == :bosh_type } }
       instance_params[:placement_group] = resource_pool["placement_group"] if resource_pool["placement_group"]
       instance_params[:dedicated_tenancy] = true if resource_pool["tenancy"] == "dedicated"
 
@@ -142,46 +143,65 @@ module Bosh::AwsCloud
       return instance_params, block_device_info
     end
 
-    def create_aws_instance(instance_params, spot_bid_price)
-      if spot_bid_price
-        @logger.info("Launching spot instance...")
-        spot_manager = Bosh::AwsCloud::SpotManager.new(@region)
-        spot_manager.create(instance_params, spot_bid_price)
-      else
-        # Retry the create instance operation a couple of times if we are told that the IP
-        # 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, 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)
+    def create_aws_spot_instance(instance_params, spot_bid_price)
+      @logger.info("Launching spot instance...")
+      spot_manager = Bosh::AwsCloud::SpotManager.new(@region)
+
+      spot_manager.create(instance_params, spot_bid_price)
+    end
+
+    def create_aws_instance(instance_params, resource_pool)
+      if resource_pool["spot_bid_price"]
+        begin
+          return create_aws_spot_instance instance_params, resource_pool["spot_bid_price"]
+        rescue Bosh::Clouds::VMCreationFailed => e
+          raise unless resource_pool["spot_ondemand_fallback"]
         end
       end
+
+      # Retry the create instance operation a couple of times if we are told that the IP
+      # 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, 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...")
+        if error.class == AWS::EC2::Errors::InvalidIPAddress::InUse
+          @logger.warn("IP address was in use: #{error}")
+        end
+        @region.instances.create(instance_params)
+      end
     end
 
-    def instance_create_wait_time; 30; end
+    def instance_create_wait_time
+      30
+    end
 
     def block_device_mapping(virtualization_type, resource_pool)
       ephemeral_disk_options = resource_pool.fetch("ephemeral_disk", {})
 
-      ephemeral_volume_size_in_mb = ephemeral_disk_options.fetch('size', 0)
-      ephemeral_volume_size_in_gb = (ephemeral_volume_size_in_mb / 1024.0).ceil
-      ephemeral_volume_type = ephemeral_disk_options.fetch('type', 'standard')
-      instance_type = resource_pool.fetch('instance_type', '')
+      requested_size = ephemeral_disk_options['size'] || 0
+      actual_size = ephemeral_disk_options['size'] || 10 * 1024
+
+      ephemeral_volume_properties = VolumeProperties.new(
+        size: actual_size,
+        type: ephemeral_disk_options['type'],
+        iops: ephemeral_disk_options['iops'],
+      )
+
+      ephemeral_volume_properties.validate!
+
+      instance_type = resource_pool.fetch('instance_type', 'unspecified')
       raw_instance_storage = resource_pool.fetch('raw_instance_storage', false)
 
       local_disk_info = InstanceManager::InstanceStorageMap[instance_type]
       if raw_instance_storage && local_disk_info.nil?
-        raise Bosh::Clouds::CloudError, "raw_instance_storage requested for instance type #{instance_type} that does not have instance storage"
+        raise Bosh::Clouds::CloudError, "raw_instance_storage requested for instance type '#{instance_type}' that does not have instance storage"
       end
 
-      if raw_instance_storage || local_disk_info.nil? || local_disk_info.size < ephemeral_volume_size_in_gb
+      if raw_instance_storage || local_disk_info.nil? || local_disk_info.size < (requested_size / 1024.0).ceil
         @logger.debug('Use EBS storage to create the virtual machine')
-
-        ephemeral_volume_size_in_gb = 10 if ephemeral_volume_size_in_gb == 0
-        block_device_mapping_param = ebs_ephemeral_disk_mapping ephemeral_volume_size_in_gb, ephemeral_volume_type
+        block_device_mapping_param = InstancesCreatePresenter.new(ephemeral_volume_properties).present
       else
         @logger.debug('Use instance storage to create the virtual machine')
         block_device_mapping_param = default_ephemeral_disk_mapping
@@ -193,38 +213,44 @@ module Bosh::AwsCloud
         next_device = first_raw_ephemeral_device(virtualization_type)
         for i in 0..local_disk_info.count - 1 do
           block_device_mapping_param << {
-              virtual_name: "ephemeral#{i}",
-              device_name: next_device,
-              bosh_type: "raw_ephemeral",
+            virtual_name: "ephemeral#{i}",
+            device_name: next_device,
+            bosh_type: "raw_ephemeral",
           }
           next_device = next_device.next
         end
       end
 
-      if(resource_pool.has_key?("root_disk"))
+      if (resource_pool.has_key?('root_disk'))
+        root_disk_size_in_mb = resource_pool['root_disk']['size']
+        root_disk_type = resource_pool['root_disk'].fetch('type', 'standard')
+        root_disk_iops = resource_pool['root_disk']['iops']
+        root_disk_volume_properties = VolumeProperties.new(
+          size: root_disk_size_in_mb,
+          type: root_disk_type,
+          iops: root_disk_iops
+        )
+        root_disk_volume_properties.validate!
+
+        root_device = {
+          :volume_size => (root_disk_size_in_mb / 1024.0).ceil,
+          :volume_type => root_disk_type,
+          :delete_on_termination => true,
+        }
 
-        if resource_pool["root_disk"]["size"].nil?
-          raise Bosh::Clouds::CloudError, "root_disk block provided without size"
+        if root_disk_type == 'io1' && root_disk_iops > 0
+          root_device[:iops] = root_disk_iops
         end
 
-        root_disk_size_in_mb = resource_pool["root_disk"]['size']
-        root_disk_type = resource_pool["root_disk"].fetch('type', 'standard')
-
-        root_device  =  {
-            :volume_size => (root_disk_size_in_mb / 1024.0).ceil,
-            :volume_type => root_disk_type,
-            :delete_on_termination => true
-        }
-
         if virtualization_type == :hvm
           block_device_mapping_param << {
-              device_name: "/dev/xvda",
-              ebs: root_device
+            device_name: "/dev/xvda",
+            ebs: root_device
           }
         else
           block_device_mapping_param << {
-              device_name: "/dev/sda",
-              ebs: root_device
+            device_name: "/dev/sda",
+            ebs: root_device
           }
         end
       end

data/lib/cloud/aws/instances_create_presenter.rb

@@ -0,0 +1,29 @@
+module Bosh
+  module AwsCloud
+    class InstancesCreatePresenter
+      attr_reader :volume_properties
+      def initialize(volume_properties)
+        @volume_properties = volume_properties
+      end
+
+      def present
+        ebs = {
+          volume_size: volume_size_in_gb,
+          volume_type: volume_properties.type,
+          delete_on_termination: true,
+        }
+
+        ebs[:iops] = volume_properties.iops if volume_properties.iops
+
+        [{device_name: '/dev/sdb', ebs: ebs}]
+      end
+
+      private
+
+      def volume_size_in_gb
+        (volume_properties.size / 1024.0).ceil
+      end
+    end
+  end
+end
+

data/lib/cloud/aws/spot_manager.rb

@@ -12,6 +12,7 @@ module Bosh::AwsCloud
     end
 
     def create(instance_params, spot_bid_price)
+      @instance_params = instance_params
       spot_request_spec = create_spot_request_spec(instance_params, spot_bid_price)
       @logger.debug("Requesting spot instance with: #{spot_request_spec.inspect}")
 
@@ -22,12 +23,12 @@ module Bosh::AwsCloud
         raise Bosh::Clouds::VMCreationFailed.new(false), e.inspect
       end
 
-      request_spot_instance
+      wait_for_spot_instance
     end
 
     private
 
-    def request_spot_instance
+    def wait_for_spot_instance
       instance = nil
 
       # Query the spot request state until it becomes "active".
@@ -43,20 +44,17 @@ module Bosh::AwsCloud
             fail_spot_creation("VM spot instance creation failed: #{status.inspect}")
           when 'open'
             if status[:status] != nil && status[:status][:code] == 'price-too-low'
-              fail_spot_creation("Cannot create VM spot instance because bid price is too low: #{status.inspect}")
+              fail_spot_creation("Cannot create VM spot instance because bid price is too low: #{status.inspect}. Reverting to creating ondemand instance")
             end
           when 'active'
             @logger.info("Spot request instances fulfilled: #{status.inspect}")
             instance = @region.instances[status[:instance_id]]
-            true
         end
       end
 
       instance
     rescue Bosh::Common::RetryCountExceeded
-      @logger.warn("Timed out waiting for spot request #{@spot_instance_requests.inspect} to be fulfilled")
-      cancel_pending_spot_requests
-      raise Bosh::Clouds::VMCreationFailed.new(true)
+      fail_spot_creation("Timed out waiting for spot request #{@spot_instance_requests.inspect} to be fulfilled. Reverting to creating ondemand instance")
     end
 
     def create_spot_request_spec(instance_params, spot_price)
@@ -103,7 +101,7 @@ module Bosh::AwsCloud
     end
 
     def fail_spot_creation(message)
-      @logger.error(message)
+      @logger.warn(message)
       cancel_pending_spot_requests
       raise Bosh::Clouds::VMCreationFailed.new(false), message
     end

data/lib/cloud/aws/volume_properties.rb

@@ -0,0 +1,44 @@
+module Bosh
+  module AwsCloud
+    class VolumeProperties
+      include Helpers
+
+      attr_reader :size, :type, :iops, :az, :encrypted
+
+      def initialize(options)
+        @size = options[:size] || 0
+        @type = options[:type] || 'standard'
+        @iops = options[:iops]
+        @az = options[:az]
+        @encrypted = options[:encrypted] || false
+      end
+
+      def validate!
+        case @type
+          when 'standard'
+            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
+            cloud_error("Cannot specify an 'iops' value when disk type is '#{@type}'. 'iops' is only allowed for 'io1' volume types.") unless @iops.nil?
+          when 'gp2'
+            cloud_error('AWS CPI minimum disk size is 1 GiB') if @size < 1024
+            cloud_error('AWS CPI maximum disk size is 16 TiB') if @size > 1024 * 16000
+            cloud_error("Cannot specify an 'iops' value when disk type is '#{@type}'. 'iops' is only allowed for 'io1' volume types.") unless @iops.nil?
+          when 'io1'
+            validate_iops
+          else
+            cloud_error("AWS CPI supports only gp2, io1, or standard disk type, received: #{@type}")
+        end
+      end
+
+      private
+
+      def validate_iops
+        cloud_error("Must specify an 'iops' value when the volume type is 'io1'") if @iops.nil?
+        cloud_error('AWS CPI minimum disk size is 4 GiB') if @size < 1024 * 4
+        cloud_error('AWS CPI maximum disk size is 16 TiB') if @size > 1024 * 16000
+        cloud_error('AWS CPI maximum iops is 20000') if @iops >= 20000
+        cloud_error('AWS CPI maximum ratio iops/size is 30') if (@iops / (@size / 1024)).floor >= 30
+      end
+    end
+  end
+end

data/lib/cloud/aws/volumes_create_presenter.rb

@@ -0,0 +1,22 @@
+module Bosh
+  module AwsCloud
+    class VolumesCreatePresenter
+      attr_reader :volume_properties
+      def initialize(volume_properties)
+        @volume_properties = volume_properties
+      end
+
+      def present
+        volume_options = {
+          size: (volume_properties.size / 1024.0).ceil,
+          availability_zone: volume_properties.az,
+          volume_type: volume_properties.type,
+          encrypted: volume_properties.encrypted
+        }
+        volume_options[:iops] = volume_properties.iops if volume_properties.iops
+        volume_options
+      end
+    end
+  end
+end
+

data/scripts/stemcell-copy.sh

@@ -16,7 +16,7 @@ IMAGE="$1"
 OUTPUT="$2"
 
 # workaround for issue on 12.04 LTS, use LANG=C
-echo ${IMAGE} | LANG=C egrep '^/[A-za-z0-9_/-]+/image$' > /dev/null 2>&1
+echo ${IMAGE} | LANG=C egrep '^/[A-Za-z0-9_/-]+/image$' > /dev/null 2>&1
 if [ $? -ne 0 ]; then
   echo "ERROR: illegal image file: ${IMAGE}"
   exit 1
@@ -34,4 +34,4 @@ if [ ! -b ${OUTPUT} ]; then
 fi
 
 # copy image to block device with 1 MB block size
-tar -xzf ${IMAGE} -O root.img | dd bs=1M of=${OUTPUT}
+tar -xzf ${IMAGE} -O root.img | dd bs=1M of=${OUTPUT}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - bin/aws_cpi
 - bin/bosh_aws_console
 - lib/bosh_aws_cpi.rb
@@ -114,6 +113,7 @@ files:
 - lib/cloud/aws/helpers.rb
 - lib/cloud/aws/instance.rb
 - lib/cloud/aws/instance_manager.rb
+- lib/cloud/aws/instances_create_presenter.rb
 - lib/cloud/aws/light_stemcell.rb
 - lib/cloud/aws/manual_network.rb
 - lib/cloud/aws/network.rb
@@ -125,6 +125,8 @@ files:
 - lib/cloud/aws/stemcell_finder.rb
 - lib/cloud/aws/tag_manager.rb
 - lib/cloud/aws/vip_network.rb
+- lib/cloud/aws/volume_properties.rb
+- lib/cloud/aws/volumes_create_presenter.rb
 - scripts/stemcell-copy.sh
 - scripts/vendor_gems
 homepage: https://github.com/cloudfoundry/bosh

data/README.md

@@ -1,125 +0,0 @@
-# BOSH AWS Cloud Provider Interface
-Copyright (c) 2009-2012 VMware, Inc.
-
-For online documentation see: http://rubydoc.info/gems/bosh_aws_cpi/
-
-## Options
-
-These options are passed to the AWS CPI when it is instantiated.
-
-### AWS options
-
-* `default_key_name` (required)
-  default AWS ssh key name to assign to created virtual machines
-* `default_security_groups` (required)
-  list of AWS security group names or ids to assign to created virtual machines, note that name and id can not be used together in this attribute.
-* `ec2_private_key` (required)
-  local path to the ssh private key, must match `default_key_name`
-* `region` (required)
-  EC2 region
-* `credentials_source` (optional)
-  Where to get AWS credentials. This can be set to `static` for to use an `access_key_id` and `secret_access_key` or `env_or_profile` to get the credentials from environment variables or an EC2 instance profile. Defaults to `static` if not set
-* `access_key_id` (optional, required when `credentials_source` is `static`)
-  AWS IAM user access key
-* `secret_access_key` (optional, required when `credentials_source` is `static`)
-  AWS IAM secret access key
-* `iam_instance_profile` (optional)
-  the [IAM Instance Profile](http://docs.aws.amazon.com/IAM/latest/UserGuide/roles-usingrole-instanceprofile.html) to use for the instance. This allows EC2 instances to use [IAM Roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html) when working with AWS APIs.
-* `ec2_endpoint` (optional)
-  URL of the EC2 endpoint to connect to, defaults to the endpoint corresponding to the selected region,
-  or `default_ec2_endpoint` if no region has been selected
-* `elb_endpoint` (optional)
-  URL of the ELB endpoint to connect to, default to the endpoint corresponding to the selected region,
-  or `default_elb_endpoint` if no region has been selected
-* `max_retries` (optional)
-  maximum number of time to retry an AWS API call, defaults to `DEFAULT_MAX_RETRIES`
-
-### Registry options
-
-The registry options are passed to the AWS CPI by the BOSH director based on the settings in `director.yml`, but can be
-overridden if needed.
-
-* `endpoint` (required)
-  registry URL
-* `user` (required)
-  registry user
-* `password` (required)
-  registry password
-
-### Agent options
-
-Agent options are passed to the AWS CPI by the BOSH director based on the settings in `director.yml`, but can be
-overridden if needed.
-
-### Resource pool options
-
-These options are specified under `cloud_options` in the `resource_pools` section of a BOSH deployment manifest.
-
-* `availability_zone` (optional)
-  the EC2 availability zone the VMs should be created in
-* `instance_type` (required)
-  which [type of instance](http://aws.amazon.com/ec2/instance-types/) the VMs should belong to
-* `spot_bid_price` (optional)
-  the [AWS spot instance](http://aws.amazon.com/ec2/purchasing-options/spot-instances/) bid price to use.  When specified spot instances are started rather than on demand instances.  _NB: this will dramatically slow down resource pool creation._
-* `iam_instance_profile` (optional)
-   the [IAM Instance Profile](http://docs.aws.amazon.com/IAM/latest/UserGuide/roles-usingrole-instanceprofile.html) to use for the instance. This allows EC2 instances to use [IAM Roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html) when working with AWS APIs.
-* `root_disk` (optional)
-   * `size` (required)
-     the size (in MB) of the root disk if a different size is needed than the default size built into the stemcell.
-   * `type` (optional)
-     the type of the root disk if a different type is needed than 'standard'
-
-### Network options
-
-These options are specified under `cloud_options` in the `networks` section of a BOSH deployment manifest.
-
-* `type` (required)
-  can be either `dynamic` for a DHCP assigned IP by AWS, or `vip` to use an Elastic IP (which needs to be already
-  allocated)
-
-* `security_groups` (optional)
-  the AWS security group names or ids to assign to VMs. If not specified, it'll use the default security groups set at the AWS options. Note that name and id can not be used together in this attribute.
-
-## Example
-
-This is a sample of how AWS specific properties are used in a BOSH deployment manifest:
-
-    ---
-    name: sample
-    director_uuid: 38ce80c3-e9e9-4aac-ba61-97c676631b91
-
-    ...
-
-    networks:
-      - name: nginx_network
-        type: vip
-        cloud_properties: {}
-      - name: default
-        type: dynamic
-        cloud_properties:
-          security_groups:
-          - default
-
-    ...
-
-    resource_pools:
-      - name: common
-        network: default
-        size: 3
-        stemcell:
-          name: bosh-aws-xen-ubuntu
-          version: latest
-        cloud_properties:
-          instance_type: m1.small
-          root_disk:
-            size: 11_264
-            type: gp2
-    ...
-
-    properties:
-      aws:
-        access_key_id: AKIAIYJWVDUP4KRWBESQ
-        secret_access_key: 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
-        default_key_name: bosh
-        default_security_groups: ["bosh"]
-        ec2_private_key: /home/bosh/.ssh/bosh