bosh_aws_cpi 0.5.0 → 0.6.0

data/lib/cloud/aws/cloud.rb

@@ -11,12 +11,6 @@ module Bosh::AwsCloud
     METADATA_TIMEOUT = 5 # seconds
     DEVICE_POLL_TIMEOUT = 60 # seconds
 
-    DEFAULT_AKI = "aki-b4aa75dd"
-    DEFAULT_ROOT_DEVICE_NAME = "/dev/sda1"
-
-    # UBUNTU_10_04_32_BIT_US_EAST_EBS = "ami-3e9b4957"
-    # UBUNTU_10_04_32_BIT_US_EAST = "ami-809a48e9"
-
     attr_reader :ec2
     attr_reader :registry
     attr_accessor :logger
@@ -101,7 +95,11 @@ module Bosh::AwsCloud
         @logger.debug("using security groups: #{security_groups.join(', ')}")
 
         response = @ec2.client.describe_images(:image_ids => [stemcell_id])
-        root_device_name = response.images_set.first.root_device_name
+        images_set = response.images_set
+        if images_set.empty?
+          cloud_error("no stemcell info for #{stemcell_id}")
+        end
+        root_device_name = images_set.first.root_device_name
 
         instance_params = {
           :image_id => stemcell_id,
@@ -285,6 +283,14 @@ module Bosh::AwsCloud
     # involves creating and mounting new EBS volume as local block device.
     # @param [String] image_path local filesystem path to a stemcell image
     # @param [Hash] cloud_properties CPI-specific properties
+    # @option cloud_properties [String] kernel_id
+    #   AKI, auto-selected based on the region
+    # @option cloud_properties [String] root_device_name
+    #   provided by the stemcell manifest
+    # @option cloud_properties [String] architecture
+    #   provided by the stemcell manifest
+    # @option cloud_properties [String] disk (2048)
+    #   root disk size
     def create_stemcell(image_path, cloud_properties)
       # TODO: refactor into several smaller methods
       with_thread_name("create_stemcell(#{image_path}...)") do
@@ -309,13 +315,18 @@ module Bosh::AwsCloud
           snapshot = volume.create_snapshot
           wait_resource(snapshot, :completed)
 
-          root_device_name = cloud_properties["root_device_name"] ||
-                             DEFAULT_ROOT_DEVICE_NAME
+          root_device_name = cloud_properties["root_device_name"]
+          architecture = cloud_properties["architecture"]
+
+          aki = find_aki(architecture, root_device_name)
 
+          # we could set :description here, but since we don't have a
+          # handle to the stemcell name and version, we can't set it
+          # to something useful :(
           image_params = {
             :name => "BOSH-#{generate_unique_name}",
-            :architecture => "x86_64", # TODO should this be configurable?
-            :kernel_id => cloud_properties["kernel_id"] || DEFAULT_AKI,
+            :architecture => architecture,
+            :kernel_id => aki,
             :root_device_name =>  root_device_name,
             :block_device_mappings => {
               "/dev/sda" => { :snapshot_id => snapshot.id },
@@ -340,6 +351,42 @@ module Bosh::AwsCloud
       end
     end
 
+    # finds the correct aki for the current region
+    def find_aki(arch, root_device_name)
+
+      filters = []
+      filters << {:name => "architecture", :values => [arch]}
+      filters << {:name => "image-type", :values => %w[kernel]}
+      filters << {:name => "owner-alias", :values => %w[amazon]}
+
+      response = @ec2.client.describe_images(:filters => filters)
+
+      # do nasty hackery to select boot device and version from
+      # the image_location string e.g. pv-grub-hd00_1.03-x86_64.gz
+      if root_device_name == "/dev/sda1"
+        regexp = /-hd00[-_](\d+)\.(\d+)/
+      else
+        regexp = /-hd0[-_](\d+)\.(\d+)/
+      end
+
+      candidate = nil
+      major = 0
+      minor = 0
+      response.images_set.each do |image|
+        match = image.image_location.match(regexp)
+        if match && match[1].to_i > major && match[2].to_i > minor
+          candidate = image
+          major = match[1].to_i
+          minor = match[2].to_i
+        end
+      end
+
+      cloud_error("unable to find AKI") unless candidate
+      @logger.info("auto-selected AKI: #{candidate.image_id}")
+
+      candidate.image_id
+    end
+
     def delete_stemcell(stemcell_id)
       with_thread_name("delete_stemcell(#{stemcell_id})") do
         image = @ec2.images[stemcell_id]
@@ -393,6 +440,7 @@ module Bosh::AwsCloud
     #   assume its identity
     # @param [Hash] network_spec Agent network spec
     # @param [Hash] environment
+    # @param [String] root_device_name root device, e.g. /dev/sda1
     # @return [Hash]
     def initial_agent_settings(agent_id, network_spec, environment,
                                root_device_name)

data/lib/cloud/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module AwsCloud
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/unit/create_stemcell_spec.rb

@@ -39,6 +39,17 @@ describe Bosh::AwsCloud::Cloud do
         ec2.volumes.stub(:[]).with("v-foo").and_return(volume)
         ec2.instances.stub(:[]).with("i-current").and_return(current_instance)
         ec2.images.should_receive(:create).with(image_params).and_return(image)
+
+        i1 = double("image-1", :root_device_name => "/dev/sda1",
+                       :image_location => "pv-grub-hd00_1.03-x86_64.gz",
+                       :image_id => "aki-b4aa75dd")
+        i2 = double("image-2", :root_device_name => "/dev/sda1",
+                    :image_location => "pv-grub-hd00_1.02-x86_64.gz",
+                    :image_id => "aki-b4aa75d0")
+
+        result = double("images_set", :images_set => [i1, i2])
+        client = double("client", :describe_images => result)
+        ec2.should_receive(:client).and_return(client)
       end
 
       cloud.stub(:generate_unique_name).and_return(unique_name)
@@ -89,7 +100,11 @@ describe Bosh::AwsCloud::Cloud do
 
       cloud.should_receive(:delete_disk).with("v-foo")
 
-      cloud.create_stemcell("/tmp/foo", {}).should == "i-bar"
+      cloud_properties = {
+          "root_device_name" => "/dev/sda1",
+          "architecture" => "x86_64"
+      }
+      cloud.create_stemcell("/tmp/foo", cloud_properties).should == "i-bar"
     end
 
   end

data/spec/unit/create_vm_spec.rb

@@ -127,6 +127,16 @@ describe Bosh::AwsCloud::Cloud, "create_vm" do
 
     cloud = mock_cloud do |ec2|
       ec2.instances.should_receive(:create).and_return(instance)
+      image = double("image")
+      image.should_receive(:root_device_name).and_return("/dev/sda1")
+
+      result = double("result")
+      result.should_receive(:images_set).and_return([image])
+
+      client = double("client")
+      client.should_receive(:describe_images).with({:image_ids=>["sc-id"]}).
+          and_return(result)
+
       ec2.should_receive(:client).and_return(client)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2403392629027305829
+      hash: 3392403251669276232
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2403392629027305829
+      hash: 3392403251669276232
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24