bosh_aws_cpi 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f772026cd4993ec84c960766136602f1a3e0ecb8
-  data.tar.gz: fa5a32aed55a00e0c51ff304fbf7d33d22883427
+  metadata.gz: 51b0fde31ccef32f21fe160d8e6ae7be77368530
+  data.tar.gz: e3b8224c4f39a0d63b64baf7efdb6b9dcc3e8d8c
 SHA512:
-  metadata.gz: ded5cb96c6cfae851201917d64530825fc6b97440648422f0b8f7763c11d58d555b2b476fa65942e4d4b7acc2f3894e5f27fcc745cc852de4d551f45d4c63c42
-  data.tar.gz: 2f84f8df96570ad6b5e9147263879c658c9011d30e882693f0441c4b803600e83605853366b495cdd05d5c8b6a87ee476a0aee9eb7869f034e7e40e5326cf5e8
+  metadata.gz: 73e29668c5edcb7e6c2101d040cafb22947262397e2976175b40bce7f38fe9d174deccc52a3550aa4c9a5cd2fa325881e9a84a99271cdc88217d27277566fc45
+  data.tar.gz: fa984ef1fa766aa9945260e513781846e71957fabcebcde03e0249e8a9582641b2bb6912f296eb81706bff5e371d15659073f8eb3b19d662111fba1bf7f19a58

data/README.md

@@ -63,6 +63,11 @@ These options are specified under `cloud_options` in the `resource_pools` sectio
   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
 
@@ -106,7 +111,9 @@ This is a sample of how AWS specific properties are used in a BOSH deployment ma
           version: latest
         cloud_properties:
           instance_type: m1.small
-
+          root_disk:
+            size: 11_264
+            type: gp2
     ...
 
     properties:

data/lib/cloud/aws/cloud.rb

@@ -156,10 +156,6 @@ module Bosh::AwsCloud
       end
     end
 
-    def default_ec2_endpoint
-      ['ec2', aws_region, 'amazonaws.com'].compact.join('.')
-    end
-
     def default_elb_endpoint
       ['elasticloadbalancing', aws_region, 'amazonaws.com'].compact.join('.')
     end
@@ -563,6 +559,11 @@ 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
@@ -572,7 +573,7 @@ module Bosh::AwsCloud
     end
 
     def aws_region
-      @aws_region ||= aws_properties.fetch('region', nil)
+      @aws_region ||= aws_properties.fetch('region')
     end
 
     def fast_path_delete?

data/lib/cloud/aws/instance_manager.rb

@@ -201,6 +201,35 @@ module Bosh::AwsCloud
         end
       end
 
+      if(resource_pool.has_key?("root_disk"))
+
+        if resource_pool["root_disk"]["size"].nil?
+          raise Bosh::Clouds::CloudError, "root_disk block provided without size"
+        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
+          }
+        else
+          block_device_mapping_param << {
+              device_name: "/dev/sda",
+              ebs: root_device
+          }
+        end
+      end
+
+
       block_device_mapping_param
     end
 

data/lib/cloud/aws/spot_manager.rb

@@ -85,6 +85,10 @@ module Bosh::AwsCloud
         spec[:launch_specification][:network_interfaces][0][:groups] = security_groups
       end
 
+      if instance_params[:block_device_mappings]
+        spec[:launch_specification][:block_device_mappings] = instance_params[:block_device_mappings]
+      end
+
       spec
     end
 

data/lib/cloud/aws/stemcell_creator.rb

@@ -22,7 +22,7 @@ module Bosh::AwsCloud
       ResourceWait.for_snapshot(snapshot: snapshot, state: :completed)
 
       params = image_params(snapshot.id)
-      image = region.images.create(params)
+      image = region.images[region.client.register_image(params).image_id]
       ResourceWait.for_image(image: image, state: :available)
 
       TagManager.tag(image, 'Name', params[:description]) if params[:description]
@@ -90,11 +90,14 @@ module Bosh::AwsCloud
                    :virtualization_type => virtualization_type,
                    :root_device_name => "/dev/xvda",
                    :sriov_net_support => "simple",
-                   :block_device_mappings => {
-                     "/dev/xvda" => {
-                       :snapshot_id => snapshot_id
-                     }
-                   }
+                   :block_device_mappings => [
+                     {
+                       :device_name => "/dev/xvda",
+                       :ebs => {
+                         :snapshot_id => snapshot_id,
+                       },
+                     },
+                   ],
                  }
                else
                  root_device_name = stemcell_properties["root_device_name"]
@@ -103,11 +106,14 @@ module Bosh::AwsCloud
                  {
                    :kernel_id => aki,
                    :root_device_name => root_device_name,
-                   :block_device_mappings => {
-                     "/dev/sda" => {
-                       :snapshot_id => snapshot_id
-                     }
-                   }
+                   :block_device_mappings => [
+                     {
+                       :device_name => "/dev/sda",
+                       :ebs => {
+                         :snapshot_id => snapshot_id,
+                       },
+                     },
+                   ],
                  }
                end
 
@@ -121,7 +127,8 @@ module Bosh::AwsCloud
         :name => "BOSH-#{SecureRandom.uuid}",
         :architecture => architecture,
       )
-      merge_default_ephemeral_mapping_for_create_disk(params)
+
+      params[:block_device_mappings].push(*default_ephemeral_disk_mapping)
 
       params
     end
@@ -129,12 +136,5 @@ module Bosh::AwsCloud
     def logger
       Bosh::Clouds::Config.logger
     end
-
-    # adapts the format of the default ephemeral mapping used by create_vm so it
-    # works with the create AMI, and inserts it into the given hash
-    def merge_default_ephemeral_mapping_for_create_disk(params)
-      ephemeral_mapping = default_ephemeral_disk_mapping[0]
-      params[:block_device_mappings][ephemeral_mapping[:device_name]] = ephemeral_mapping[:virtual_name]
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: BOSH AWS CPI