bosh_aws_cpi 1.2697.0 → 1.2707.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 456f9080f06c1497ee3373f146e864ef8b3791b5
-  data.tar.gz: ac957771a31ebfa5614208ca96642c3322577531
+  metadata.gz: 49712bfb2cf1a45d7b3a3c1fe0258d45229c2b81
+  data.tar.gz: 1386c0d88b30296aa1e6f87ba08e154c6b88b9a7
 SHA512:
-  metadata.gz: 39e38c3460ba89a9e9e00e2a8d3e685e8d7a7cfd6cfbdb91199d8330a1052aa4924ada559d830e03036c9219e6a0c176a6a0b5bb13cd3d1b56e1e2809ee38314
-  data.tar.gz: 0307eeb3362009915763f2357ff60a6d1f04c30a5692b2b06d1aecea72efce54df61081b4544683676c0bafd9f5f860de23f262215f70285219ea0d5022debfa
+  metadata.gz: 64c2970c3411a408e2b1ceb5acc0ea3f278ddea3ecb0868db77297317a8f083ea78250dc529ab17313584cf1617dea384df44713ccddce670c24a5b1394d3e12
+  data.tar.gz: 0620ce9fd27fbe8cda976d19e5d176ed72571bad6b3868e10acc7d6fce382b05f3ef75712738e5503f588284ccdbcd7152aee73f83f788316dbe948f21bbc8e0

data/lib/cloud/aws/cloud.rb

@@ -162,13 +162,23 @@ module Bosh::AwsCloud
     # @param [optional, String] instance_id EC2 instance id
     #        of the VM that this disk will be attached to
     # @return [String] created EBS volume id
-    def create_disk(size, instance_id = nil)
+    def create_disk(size, cloud_properties, instance_id = nil)
       with_thread_name("create_disk(#{size}, #{instance_id})") do
         validate_disk_size(size)
 
+        if cloud_properties.has_key?('type')
+          validate_disk_type(cloud_properties['type'])
+          volume_type = cloud_properties['type']
+        else
+          volume_type = 'standard'
+        end
+
         # 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 = @ec2.volumes.create(
+          size: (size / 1024.0).ceil,
+          availability_zone: @az_selector.select_availability_zone(instance_id),
+          volume_type: volume_type
+        )
 
         logger.info("Creating volume '#{volume.id}'")
         ResourceWait.for_volume(volume: volume, state: :available)
@@ -178,10 +188,16 @@ module Bosh::AwsCloud
     end
 
     def validate_disk_size(size)
-      raise ArgumentError, "disk size needs to be an integer" unless size.kind_of?(Integer)
+      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
+      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
+    end
+
+    def validate_disk_type(type)
+      unless %w[gp2 standard].include?(type)
+        cloud_error('AWS CPI supports only gp2 or standard disk type')
+      end
     end
 
     ##
@@ -403,7 +419,7 @@ module Bosh::AwsCloud
 
           # 1. Create and mount new EBS volume (2GB default)
           disk_size = stemcell_properties["disk"] || 2048
-          volume_id = create_disk(disk_size, current_vm_id)
+          volume_id = create_disk(disk_size, {}, current_vm_id)
           volume = @ec2.volumes[volume_id]
           instance = @ec2.instances[current_vm_id]
 

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2697.0'
+    VERSION = '1.2707.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2697.0
+  version: 1.2707.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-27 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.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2697.0
+        version: 1.2707.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: 0.8.2
 description: |-
   BOSH AWS CPI
-  ca0ac0
+  3e8bee
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console