bosh-stemcell 1.2732.0 → 1.2739.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af57b2b2aa30aeb5e1371bac76cc2089a8c9a11
-  data.tar.gz: d85dcb63119f9b54967bd8994e19c2ed94534f98
+  metadata.gz: f391c492204806e3bfcd171e26854c8af6408f95
+  data.tar.gz: c6c48c98b4c63f4969e8d05ef9b6a257edcf3875
 SHA512:
-  metadata.gz: c4a975a647be7580188d58926442860781afa0688d116bb89d4f0676070bfc6ecbc3e8fa041755df3fde41d87e24327dd00d2a9807265f3e924aeb3421b6d172
-  data.tar.gz: 80d441d98f340b07d55f05cb7c9794194e995efb593726719df72d24bee61e1693b93ae699bf57b525f63aa9eb11b2fa95db42e5a05d1113e4fd43ecb28a4b90
+  metadata.gz: f38634e2673109b6301ed6854a1ae4ec88fbe46c0e0f449bcb430525812e63479a7b01372eef5cf81db77d8217470c37b585c88875b3c63b25bed512078ca840
+  data.tar.gz: c96dfad9f812e7a2e3bf822d77228fa192cbd337463e9580567700c12abbf9523a089cbced1e9f3824ee90ba666570b789e4e6f696f088a900e08dc170828f05

data/README.md

@@ -31,7 +31,7 @@ The final two arguments are the S3 bucket and key for the OS image to use, which
 
     vagrant ssh -c '
       cd /bosh
-      CANDIDATE_BUILD_NUMBER=<current_build> http_proxy=http://localhost:3142/ bundle exec rake stemcell:build[vsphere,centos,nil,ruby,bosh-os-images,bosh-centos-6_5-os-image.tgz]
+      CANDIDATE_BUILD_NUMBER=<current_build> http_proxy=http://localhost:3142/ bundle exec rake stemcell:build[vsphere,esxi,centos,nil,ruby,bosh-os-images,bosh-centos-6_5-os-image.tgz]
     ' remote
 
 # Run the stemcell locally with Fusion
@@ -113,6 +113,6 @@ A stemcell with a custom OS image can be built using the stemcell-building VM cr
     vagrant ssh -c '
       cd /bosh
       bundle exec rake stemcell:build_os_image[ubuntu,trusty,/tmp/ubuntu_base_image.tgz]
-      bundle exec rake stemcell:build_with_local_os_image[aws,ubuntu,trusty,go,/tmp/ubuntu_base_image.tgz]
+      bundle exec rake stemcell:build_with_local_os_image[aws,xen,ubuntu,trusty,ruby,/tmp/ubuntu_base_image.tgz]
     ' remote
 

data/lib/bosh/stemcell/archive_filename.rb

@@ -4,18 +4,17 @@ module Bosh::Stemcell
   class ArchiveFilename
     extend Forwardable
 
-    def initialize(version, definition, base_name, light)
+    def initialize(version, definition, base_name)
       @version = version
       @definition = definition
       @base_name = base_name
-      @light = light
     end
 
     def to_s
       stemcell_filename_parts = [
         name,
         version,
-        @definition.stemcell_name
+        definition.stemcell_name
       ]
       "#{stemcell_filename_parts.join('-')}.tgz"
     end
@@ -23,13 +22,13 @@ module Bosh::Stemcell
     private
 
     def name
-      light ? "light-#{base_name}" : base_name
+      definition.light? ? "light-#{base_name}" : base_name
     end
 
     attr_reader(
       :base_name,
       :version,
-      :light,
+      :definition,
     )
   end
 end

data/lib/bosh/stemcell/aws/ami.rb

@@ -9,9 +9,10 @@ module Bosh::Stemcell::Aws
   class Ami
     attr_reader :stemcell
 
-    def initialize(stemcell, region)
+    def initialize(stemcell, region, virtualization_type)
       @stemcell = stemcell
       @region = region
+      @virtualization_type = virtualization_type || 'paravirtual'
     end
 
     def publish
@@ -21,7 +22,10 @@ module Bosh::Stemcell::Aws
       cloud = Bosh::Clouds::Provider.create(options, 'fake-director-uuid')
 
       stemcell.extract do |tmp_dir, stemcell_manifest|
-        ami_id = cloud.create_stemcell("#{tmp_dir}/image", stemcell_manifest['cloud_properties'])
+        cloud_properties = stemcell_manifest['cloud_properties'].merge(
+          'virtualization_type' => virtualization_type
+        )
+        ami_id = cloud.create_stemcell("#{tmp_dir}/image", cloud_properties)
         cloud.ec2.images[ami_id].public = true
         ami_id
       end
@@ -29,7 +33,7 @@ module Bosh::Stemcell::Aws
 
     private
 
-    attr_reader :region
+    attr_reader :region, :virtualization_type
 
     def options
       # just fake the registry struct, as we don't use it

data/lib/bosh/stemcell/aws/light_stemcell.rb

@@ -6,8 +6,9 @@ require 'bosh/stemcell/aws/ami'
 
 module Bosh::Stemcell::Aws
   class LightStemcell
-    def initialize(stemcell)
+    def initialize(stemcell, virtualization_type)
       @stemcell = stemcell
+      @virtualization_type = virtualization_type
     end
 
     def write_archive
@@ -25,16 +26,18 @@ module Bosh::Stemcell::Aws
     end
 
     def path
-      File.join(File.dirname(stemcell.path), "light-#{File.basename(stemcell.path)}")
+      stemcell_name = File.basename(stemcell.path)
+      stemcell_name = stemcell_name.gsub("xen", "xen-hvm") if virtualization_type == "hvm"
+      File.join(File.dirname(stemcell.path), "light-#{stemcell_name}")
     end
 
     private
 
-    attr_reader :stemcell
+    attr_reader :stemcell, :virtualization_type
 
     def manifest
       region = Region.new
-      ami = Ami.new(stemcell, region)
+      ami = Ami.new(stemcell, region, virtualization_type)
       ami_id = ami.publish
       manifest = Bosh::Common::DeepCopy.copy(stemcell.manifest)
       manifest['cloud_properties']['ami'] = { region.name => ami_id }

data/lib/bosh/stemcell/builder_options.rb

@@ -77,7 +77,7 @@ module Bosh::Stemcell
     end
 
     def archive_filename
-      ArchiveFilename.new(stemcell_version, definition, 'bosh-stemcell', false)
+      ArchiveFilename.new(stemcell_version, definition, 'bosh-stemcell')
     end
 
     def stemcell_image_name

data/lib/bosh/stemcell/definition.rb

@@ -4,26 +4,37 @@ require 'bosh/stemcell/agent'
 
 module Bosh::Stemcell
   class Definition
-    attr_reader :infrastructure, :operating_system, :agent
+    attr_reader :infrastructure, :hypervisor_name, :operating_system, :agent
 
-    def self.for(infrastructure_name, operating_system_name, operating_system_version, agent_name)
+    def self.for(
+      infrastructure_name,
+      hypervisor_name,
+      operating_system_name,
+      operating_system_version,
+      agent_name,
+      light
+    )
       new(
         Bosh::Stemcell::Infrastructure.for(infrastructure_name),
+        hypervisor_name,
         Bosh::Stemcell::OperatingSystem.for(operating_system_name, operating_system_version),
         Bosh::Stemcell::Agent.for(agent_name),
+        light
       )
     end
 
-    def initialize(infrastructure, operating_system, agent)
+    def initialize(infrastructure, hypervisor_name, operating_system, agent, light)
       @infrastructure = infrastructure
+      @hypervisor_name = hypervisor_name
       @operating_system = operating_system
       @agent = agent
+      @light = light
     end
 
     def stemcell_name
       stemcell_name_parts = [
         infrastructure.name,
-        infrastructure.hypervisor,
+        hypervisor_name,
         operating_system.name,
       ]
       stemcell_name_parts << operating_system.version if operating_system.version
@@ -34,7 +45,12 @@ module Bosh::Stemcell
     def ==(other)
       infrastructure == other.infrastructure &&
         operating_system == other.operating_system &&
-        agent == other.agent
+        agent == other.agent &&
+        light? == other.light?
+    end
+
+    def light?
+      @light
     end
   end
 end

data/lib/bosh/stemcell/infrastructure.rb

@@ -29,15 +29,10 @@ module Bosh::Stemcell
         @default_disk_size = options.fetch(:default_disk_size)
       end
 
-      def light?
-        @supports_light_stemcell
-      end
-
       def ==(other)
         name == other.name &&
           hypervisor == other.hypervisor &&
-          default_disk_size == other.default_disk_size &&
-          light? == other.light?
+          default_disk_size == other.default_disk_size
       end
     end
 

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2732.0'
+    VERSION = '1.2739.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2732.0
+  version: 1.2739.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2732.0
+        version: 1.2739.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement