bosh_aws_cpi 1.2811.0 → 1.2818.0

data/lib/cloud/aws/cloud.rb

@@ -166,18 +166,12 @@ module Bosh::AwsCloud
       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_type: volume_type
+          volume_type: validate_disk_type(cloud_properties.fetch('type', 'standard')),
+          encrypted: cloud_properties.fetch('encrypted', false)
         )
 
         logger.info("Creating volume '#{volume.id}'")
@@ -198,6 +192,7 @@ module Bosh::AwsCloud
       unless %w[gp2 standard].include?(type)
         cloud_error('AWS CPI supports only gp2 or standard disk type')
       end
+      type
     end
 
     ##

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2811.0'
+    VERSION = '1.2818.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2811.0
+  version: 1.2818.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-01-16 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.44.0
+        version: 1.60.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.44.0
+        version: 1.60.2
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2811.0
+        version: 1.2818.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2811.0
+        version: 1.2818.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.2811.0
+        version: 1.2818.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2811.0
+        version: 1.2818.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.2811.0
+        version: 1.2818.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2811.0
+        version: 1.2818.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
 
-  e460f9'
+  59d102'
 email: support@cloudfoundry.com
 executables:
 - aws_cpi
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2650463579847981588
+      hash: -431903187477590241
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23