bosh_aws_cpi 1.5.0.pre.1492 → 1.5.0.pre.1504

data/lib/cloud/aws/cloud.rb

@@ -1,4 +1,5 @@
 # Copyright (c) 2009-2012 VMware, Inc.
+require 'cloud/aws/stemcell_finder'
 
 module Bosh::AwsCloud
 
@@ -80,12 +81,12 @@ module Bosh::AwsCloud
     def create_vm(agent_id, stemcell_id, resource_pool, network_spec, disk_locality = nil, environment = nil)
       with_thread_name("create_vm(#{agent_id}, ...)") do
         # do this early to fail fast
-        stemcell = Stemcell.find(region, stemcell_id)
+        stemcell = StemcellFinder.find_by_region_and_id(region, stemcell_id)
 
         begin
           instance_manager = InstanceManager.new(region, registry, az_selector)
           instance = instance_manager.
-              create(agent_id, stemcell_id, resource_pool, network_spec, (disk_locality || []), environment, options)
+              create(agent_id, stemcell.image_id, resource_pool, network_spec, (disk_locality || []), environment, options)
 
           logger.info("Creating new instance '#{instance.id}'")
 
@@ -417,7 +418,7 @@ module Bosh::AwsCloud
     # @param [String] stemcell_id EC2 AMI name of the stemcell to be deleted
     def delete_stemcell(stemcell_id)
       with_thread_name("delete_stemcell(#{stemcell_id})") do
-        stemcell = Stemcell.find(region, stemcell_id)
+        stemcell = StemcellFinder.find_by_region_and_id(region, stemcell_id)
         stemcell.delete
       end
     end

data/lib/cloud/aws/light_stemcell.rb

@@ -0,0 +1,24 @@
+module Bosh::AwsCloud
+  class LightStemcell
+    def initialize(heavy_stemcell, logger)
+      @logger = logger
+      @heavy_stemcell = heavy_stemcell
+    end
+
+    def delete
+      @logger.info("NoOP: Deleting light stemcell '#{@heavy_stemcell.id}'")
+    end
+
+    def id
+      "#{@heavy_stemcell.id} light"
+    end
+
+    def root_device_name
+      @heavy_stemcell.root_device_name
+    end
+
+    def image_id
+      @heavy_stemcell.image_id
+    end
+  end
+end

data/lib/cloud/aws/stemcell.rb

@@ -27,6 +27,9 @@ module Bosh::AwsCloud
 
       delete_snapshots
       logger.info("deleted stemcell '#{id}'")
+    # The following suppression of AuthFailure is potentially dangerous
+    # But we have to do it here because we need to be compatible with existing
+    # light stemcells in BOSH DB which appear to be "heavy".
     rescue AWS::EC2::Errors::AuthFailure => e
       # If we get an auth failure from the deregister call, it means we don't own the AMI
       # and we were just faking it, so we can just return pretending that we deleted it.
@@ -37,14 +40,18 @@ module Bosh::AwsCloud
       ami.id
     end
 
+    def image_id
+      ami.id
+    end
+
     def root_device_name
       ami.root_device_name
     end
 
     def memoize_snapshots
-      # .to_h is used as the AWS API documentation isn't trustworthy:
+      # .to_hash is used as the AWS API documentation isn't trustworthy:
       # it says block_device_mappings retruns a Hash, but in reality it flattens it!
-      ami.block_device_mappings.to_h.each do |device, map|
+      ami.block_device_mappings.to_hash.each do |device, map|
         snapshot_id = map[:snapshot_id]
         if id
           logger.debug("queuing snapshot '#{snapshot_id}' for deletion")

data/lib/cloud/aws/stemcell_creator.rb

@@ -39,7 +39,7 @@ module Bosh::AwsCloud
 
       raise Bosh::Clouds::CloudError, "Stemcell does not contain an AMI for this region (#{region.name})" unless id
 
-      Stemcell.find(region, id)
+      StemcellFinder.find_by_region_and_id(region, "#{id} light")
     end
 
     # This method tries to execute the helper script stemcell-copy

data/lib/cloud/aws/stemcell_finder.rb

@@ -0,0 +1,14 @@
+require 'cloud/aws/light_stemcell'
+require 'cloud/aws/stemcell'
+
+module Bosh::AwsCloud
+  class StemcellFinder
+    def self.find_by_region_and_id(region, id)
+      if id =~ / light$/
+        LightStemcell.new(Stemcell.find(region, id[0...-6]), Bosh::Clouds::Config.logger)
+      else
+        Stemcell.find(region, id)
+      end
+    end
+  end
+end

data/lib/cloud/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module AwsCloud
-    VERSION = '1.5.0.pre.1492'
+    VERSION = '1.5.0.pre.1504'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1492
+  version: 1.5.0.pre.1504
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-07 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.5.0.pre.1492
+        version: 1.5.0.pre.1504
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1492
+        version: 1.5.0.pre.1504
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1492
+        version: 1.5.0.pre.1504
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1492
+        version: 1.5.0.pre.1504
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1492
+        version: 1.5.0.pre.1504
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1492
+        version: 1.5.0.pre.1504
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH AWS CPI
 
-  966b08'
+  882c2b'
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console
@@ -125,12 +125,14 @@ files:
 - lib/cloud/aws/dynamic_network.rb
 - lib/cloud/aws/helpers.rb
 - lib/cloud/aws/instance_manager.rb
+- lib/cloud/aws/light_stemcell.rb
 - lib/cloud/aws/manual_network.rb
 - lib/cloud/aws/network.rb
 - lib/cloud/aws/network_configurator.rb
 - lib/cloud/aws/resource_wait.rb
 - lib/cloud/aws/stemcell.rb
 - lib/cloud/aws/stemcell_creator.rb
+- lib/cloud/aws/stemcell_finder.rb
 - lib/cloud/aws/tag_manager.rb
 - lib/cloud/aws/version.rb
 - lib/cloud/aws/vip_network.rb