bosh_aws_cpi 1.2809.0 → 1.2810.0

data/lib/cloud/aws/helpers.rb

@@ -3,10 +3,6 @@
 module Bosh::AwsCloud
 
   module Helpers
-    def default_ephemeral_disk_mapping
-      { '/dev/sdb' => 'ephemeral0' }
-    end
-
     ##
     # Raises CloudError exception
     #

data/lib/cloud/aws/instance_manager.rb

@@ -14,12 +14,46 @@ module Bosh::AwsCloud
     end
 
     def create(agent_id, stemcell_id, resource_pool, networks_spec, disk_locality, environment, options)
+      instance_params = build_instance_params(stemcell_id, resource_pool, networks_spec, disk_locality, options)
+
+      @logger.info("Creating new instance with: #{instance_params.inspect}")
+
+      aws_instance = create_aws_instance(instance_params, resource_pool["spot_bid_price"])
+
+      instance = Instance.new(aws_instance, @registry, @elb, @logger)
+
+      begin
+        # 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.
+        instance.wait_for_running
+        instance.attach_to_load_balancers(resource_pool['elbs'] || [])
+      rescue => e
+        @logger.warn("Failed to configure instance '#{instance.id}': #{e.inspect}")
+        begin
+          instance.terminate
+        rescue => e
+          @logger.error("Failed to terminate mis-configured instance '#{instance.id}': #{e.inspect}")
+        end
+        raise
+      end
+
+      instance
+    end
+
+    # @param [String] instance_id EC2 instance id
+    def find(instance_id)
+      Instance.new(@region.instances[instance_id], @registry, @elb, @logger)
+    end
+
+    private
+
+    def build_instance_params(stemcell_id, resource_pool, networks_spec, disk_locality, options)
       instance_params = {count: 1}
       instance_params[:image_id] = stemcell_id
       instance_params[:instance_type] = resource_pool["instance_type"]
 
-      # m3 instances require that instance storage mappings be specified when the instance is created... [#84893804]
-      instance_params[:block_device_mappings] = default_ephemeral_disk_mapping
+      ephemeral_disk_options = resource_pool.fetch("ephemeral_disk", {})
+      instance_params[:block_device_mappings] = block_device_mapping(ephemeral_disk_options)
 
       set_user_data_parameter(instance_params, networks_spec)
       set_key_name_parameter(instance_params, resource_pool["key_name"], options["aws"]["default_key_name"])
@@ -32,14 +66,14 @@ module Bosh::AwsCloud
         resource_pool["availability_zone"],
         (instance_params[:subnet].availability_zone_name if instance_params[:subnet])
       )
+      instance_params
+    end
 
-      @logger.info("Creating new instance with: #{instance_params.inspect}")
-
-      aws_instance = nil
-      if resource_pool["spot_bid_price"]
+    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)
-        aws_instance = spot_manager.create(instance_params, resource_pool["spot_bid_price"])
+        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
@@ -49,33 +83,33 @@ module Bosh::AwsCloud
         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
-          aws_instance = @region.instances.create(instance_params)
+          @region.instances.create(instance_params)
         end
       end
+    end
 
-      instance = Instance.new(aws_instance, @registry, @elb, @logger)
+    def instance_create_wait_time; 30; end
 
-      begin
-        # 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.
-        instance.wait_for_running
-        instance.attach_to_load_balancers(resource_pool['elbs'] || [])
-      rescue => e
-        @logger.warn("Failed to configure instance '#{instance.id}': #{e.inspect}")
-        begin
-          instance.terminate
-        rescue => e
-          @logger.error("Failed to terminate mis-configured instance '#{instance.id}': #{e.inspect}")
-        end
-        raise
+    def block_device_mapping(ephemeral_disk_options)
+      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')
+
+      if ephemeral_volume_size_in_mb > 0
+        [
+          {
+            device_name: '/dev/sdb',
+            ebs: {
+              volume_size: ephemeral_volume_size_in_gb,
+              volume_type: ephemeral_volume_type,
+              delete_on_termination: true,
+            },
+          },
+        ]
+      else
+        # m3 instances require that instance storage mappings be specified when the instance is created... [#84893804]
+        { '/dev/sdb' => 'ephemeral0' }
       end
-
-      instance
-    end
-
-    # @param [String] instance_id EC2 instance id
-    def find(instance_id)
-      Instance.new(@region.instances[instance_id], @registry, @elb, @logger)
     end
 
     def set_key_name_parameter(instance_params, resource_pool_key_name, default_aws_key_name)
@@ -100,10 +134,10 @@ module Bosh::AwsCloud
 
       subnet_network_spec = network_spec.values.select { |spec|
         ["manual", nil, "dynamic"].include?(spec["type"]) &&
-        spec.fetch("cloud_properties", {}).has_key?("subnet")
+          spec.fetch("cloud_properties", {}).has_key?("subnet")
       }.first
       if subnet_network_spec
-          instance_params[:subnet] = @region.subnets[subnet_network_spec["cloud_properties"]["subnet"]]
+        instance_params[:subnet] = @region.subnets[subnet_network_spec["cloud_properties"]["subnet"]]
       end
     end
 
@@ -120,9 +154,5 @@ module Bosh::AwsCloud
 
       instance_params[:user_data] = Yajl::Encoder.encode(user_data)
     end
-
-    private
-
-    def instance_create_wait_time; 30; end
   end
 end

data/lib/cloud/aws/stemcell_creator.rb

@@ -118,10 +118,7 @@ module Bosh::AwsCloud
 
       params.merge!(
         :name => "BOSH-#{SecureRandom.uuid}",
-        :architecture => architecture,
-        :block_device_mappings => params[:block_device_mappings].merge(
-          default_ephemeral_disk_mapping
-        )
+        :architecture => architecture
       )
 
       params

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2809.0'
+    VERSION = '1.2810.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2809.0
+  version: 1.2810.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2809.0
+        version: 1.2810.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2809.0
+        version: 1.2810.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.2809.0
+        version: 1.2810.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2809.0
+        version: 1.2810.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.2809.0
+        version: 1.2810.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2809.0
+        version: 1.2810.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
 
-  f3cadb'
+  06dee6'
 email: support@cloudfoundry.com
 executables:
 - aws_cpi
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4435118290001417514
+      hash: -1480020702912915128
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23