bosh_aws_cpi 1.2068.0 → 1.2086.0

data/README.md

@@ -55,6 +55,8 @@ These options are specified under `cloud_options` in the `resource_pools` sectio
   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._
 
 ### Network options
 

data/lib/cloud/aws/instance_manager.rb

@@ -1,4 +1,5 @@
 require "common/common"
+require "time"
 
 module Bosh::AwsCloud
   class InstanceManager
@@ -28,18 +29,44 @@ module Bosh::AwsCloud
           resource_pool["availability_zone"],
           (@instance_params[:subnet].availability_zone_name if @instance_params[:subnet])
       )
-
+      
       @logger.info("Creating new instance with: #{instance_params.inspect}")
-
-      # 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]
-      Bosh::Common.retryable(sleep: instance_create_wait_time, tries: 10, on: errors) do |tries, error|
-        @logger.warn("IP address was in use: #{error}") if tries > 0
-        @instance = @region.instances.create(instance_params)
-      end
+      
+      if resource_pool["spot_bid_price"]
+        @logger.info("Launching spot instance...")
+        security_group_ids = []
+        @region.security_groups.each do |group|
+           security_group_ids << group.security_group_id if @instance_params[:security_groups].include?(group.name)
+        end 
+        spot_request_spec = create_spot_request_spec(instance_params, security_group_ids, resource_pool["spot_bid_price"])
+        @logger.debug("Requesting spot instance with: #{spot_request_spec.inspect}")
+        spot_instance_requests = @region.client.request_spot_instances(spot_request_spec) 
+        @logger.debug("Got spot instance requests: #{spot_instance_requests.inspect}") 
+        
+        Bosh::Common.retryable(sleep: instance_create_wait_time*2, tries: 20) do |tries, error|
+            @logger.debug("Checking state of spot instance requests...")
+            spot_instance_request_ids = spot_instance_requests[:spot_instance_request_set].map { |r| r[:spot_instance_request_id] } 
+            response = @region.client.describe_spot_instance_requests(:spot_instance_request_ids => spot_instance_request_ids)
+            statuses = response[:spot_instance_request_set].map { |rr| rr[:state] }
+            @logger.debug("Spot instance request states: #{statuses.inspect}")
+            if statuses.all? { |s| s == 'active' }
+               @logger.info("Spot request instances fulfilled: #{response.inspect}")
+               instance_id = response[:spot_instance_request_set].map { |rr| rr[:instance_id] }[0]
+               @instance = @region.instances[instance_id]
+            end
+        end
+      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]
+        Bosh::Common.retryable(sleep: instance_create_wait_time, tries: 10, on: errors) do |tries, error|
+          @logger.info("Launching on demand instance...") 
+          @logger.warn("IP address was in use: #{error}") if tries > 0
+          @instance = @region.instances.create(instance_params)
+        end
+      end 
 
       # We need to wait here for the instance to be running, as if we are going to
       # attach to a load balancer, the instance must be running.
@@ -47,6 +74,7 @@ module Bosh::AwsCloud
       # so we signal the director that it is ok to retry the operation. At the moment this
       # forever (until the operation is cancelled by the user).
       begin
+        @logger.info("Waiting for instance to be ready...") 
         ResourceWait.for_instance(instance: instance, state: :running)
       rescue Bosh::Common::RetryCountExceeded => e
         @logger.warn("timed out waiting for #{instance.id} to be running")
@@ -59,6 +87,30 @@ module Bosh::AwsCloud
       instance
     end
 
+    def create_spot_request_spec(instance_params, security_group_ids, spot_price) {
+      spot_price: "#{spot_price}",
+      instance_count: 1,
+      valid_until: "#{(Time.now + 20*60).utc.iso8601}",
+      launch_specification: {
+        image_id: instance_params[:image_id],
+        key_name: instance_params[:key_name],
+        instance_type: instance_params[:instance_type],
+        user_data: Base64.encode64(instance_params[:user_data]),
+        placement: {
+          availability_zone: instance_params[:availability_zone]
+        },
+        network_interfaces: [ 
+          { 
+            subnet_id: instance_params[:subnet].subnet_id,
+            groups: security_group_ids,
+            device_index: 0,
+            private_ip_address: instance_params[:private_ip_address]
+          } 
+        ]
+      }
+    }
+    end
+
     def terminate(instance_id, fast=false)
       @instance = @region.instances[instance_id]
 
@@ -173,4 +225,4 @@ module Bosh::AwsCloud
 
     def instance_create_wait_time; 30; end
   end
-end
+end

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2068.0'
+    VERSION = '1.2086.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2068.0
+  version: 1.2086.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.32.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2068.0
+        version: 1.2086.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH AWS CPI
 
-  5f63a5'
+  8d26be'
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3022178171211182225
+      hash: -1292915204302962026
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23