bosh-stemcell 1.2824.0 → 1.2827.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f1c339921855e06733713773ff4bcf64e21bdd2b
+  data.tar.gz: 321ea72e34e48f90542109061bf8285805c4b648
+SHA512:
+  metadata.gz: 2a4027b6c935f99ea31e7bbfa156100316e2a5fe42ff0e7e92ee4cf9985cb971ead1135650afcaa03809233a42b7810ed061375624985c6cc4825604dd27de55
+  data.tar.gz: 632be5e53195844d33857540e085d3a4f2397137454990ad586a9f2384d3f4df893f551936f10268e7a102e48c4ee18f272dafe371fb78c34ce64c074f6d94ac

data/lib/bosh/stemcell/archive_filename.rb

@@ -4,18 +4,20 @@ module Bosh::Stemcell
   class ArchiveFilename
     extend Forwardable
 
-    def initialize(version, definition, base_name)
+    def initialize(version, definition, base_name, disk_format)
       @version = version
       @definition = definition
       @base_name = base_name
+      @disk_format = disk_format
     end
 
     def to_s
       stemcell_filename_parts = [
         name,
         version,
-        definition.stemcell_name
+        definition.stemcell_name(disk_format)
       ]
+
       "#{stemcell_filename_parts.join('-')}.tgz"
     end
 
@@ -29,6 +31,7 @@ module Bosh::Stemcell
       :base_name,
       :version,
       :definition,
+      :disk_format,
     )
   end
 end

data/lib/bosh/stemcell/build_environment.rb

@@ -1,5 +1,6 @@
 require 'bosh/core/shell'
 require 'bosh/stemcell/builder_options'
+require 'bosh/stemcell/stemcell'
 require 'forwardable'
 
 module Bosh::Stemcell
@@ -13,6 +14,7 @@ module Bosh::Stemcell
       @environment = env
       @definition = definition
       @os_image_tarball_path = os_image_tarball_path
+      @version = version
       @stemcell_builder_options = BuilderOptions.new(
         env: env,
         definition: definition,
@@ -23,11 +25,14 @@ module Bosh::Stemcell
       @shell = Bosh::Core::Shell.new
     end
 
+    attr_reader :version
+
     def prepare_build
       sanitize
       prepare_build_path
       copy_stemcell_builder_to_build_path
       prepare_work_root
+      prepare_stemcell_path
       persist_settings_for_bash
     end
 
@@ -55,8 +60,11 @@ module Bosh::Stemcell
       File.join(build_root, 'build')
     end
 
-    def stemcell_file
-      File.join(work_path, settings['stemcell_tgz'])
+    def stemcell_files
+      definition.disk_formats.map do |disk_format|
+        stemcell_filename = Stemcell.new(@definition, 'bosh-stemcell', @version, disk_format)
+        File.join(work_path, stemcell_filename.name)
+      end
     end
 
     def chroot_dir
@@ -71,6 +79,10 @@ module Bosh::Stemcell
       File.join(work_root, 'work')
     end
 
+    def stemcell_tarball_path
+      work_path
+    end
+
     def command_env
       "env #{hash_as_bash_env(proxy_settings_from_environment)}"
     end
@@ -116,6 +128,10 @@ module Bosh::Stemcell
       FileUtils.mkdir_p(build_path, verbose: true)
     end
 
+    def prepare_stemcell_path
+      FileUtils.mkdir_p(File.join(work_path, 'stemcell'))
+    end
+
     def copy_stemcell_builder_to_build_path
       FileUtils.cp_r(Dir.glob("#{STEMCELL_BUILDER_SOURCE_DIR}/*"), build_path, preserve: true, verbose: true)
     end

data/lib/bosh/stemcell/builder_options.rb

@@ -18,8 +18,6 @@ module Bosh::Stemcell
 
     def default
       {
-        'stemcell_name' => "bosh-#{@definition.stemcell_name}",
-        'stemcell_tgz' => archive_filename.to_s,
         'stemcell_image_name' => stemcell_image_name,
         'stemcell_version' => stemcell_version,
         'stemcell_hypervisor' => infrastructure.hypervisor,
@@ -34,6 +32,10 @@ module Bosh::Stemcell
       }.merge(bosh_micro_options).merge(environment_variables).merge(ovf_options)
     end
 
+    attr_reader(
+      :stemcell_version,
+    )
+
     private
 
     def_delegators(
@@ -45,7 +47,6 @@ module Bosh::Stemcell
 
     attr_reader(
       :environment,
-      :stemcell_version,
       :definition,
       :image_create_disk_size,
       :bosh_micro_release_tgz_path,
@@ -76,10 +77,6 @@ module Bosh::Stemcell
       }
     end
 
-    def archive_filename
-      ArchiveFilename.new(stemcell_version, definition, 'bosh-stemcell')
-    end
-
     def stemcell_image_name
       "#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}.raw"
     end

data/lib/bosh/stemcell/definition.rb

@@ -19,7 +19,7 @@ module Bosh::Stemcell
         hypervisor_name,
         Bosh::Stemcell::OperatingSystem.for(operating_system_name, operating_system_version),
         Bosh::Stemcell::Agent.for(agent_name),
-        light
+        light,
       )
     end
 
@@ -31,7 +31,7 @@ module Bosh::Stemcell
       @light = light
     end
 
-    def stemcell_name
+    def stemcell_name(disk_format)
       stemcell_name_parts = [
         infrastructure.name,
         hypervisor_name,
@@ -39,9 +39,15 @@ module Bosh::Stemcell
       ]
       stemcell_name_parts << operating_system.version if operating_system.version
       stemcell_name_parts << "#{agent.name}_agent" unless agent.name == 'ruby'
+      stemcell_name_parts << disk_format unless disk_format == infrastructure.default_disk_format
+
       stemcell_name_parts.join('-')
     end
 
+    def disk_formats
+      infrastructure.disk_formats
+    end
+
     def ==(other)
       infrastructure == other.infrastructure &&
         operating_system == other.operating_system &&
@@ -50,7 +56,7 @@ module Bosh::Stemcell
     end
 
     def light?
-      @light
+      @light == true
     end
   end
 end

data/lib/bosh/stemcell/infrastructure.rb

@@ -20,13 +20,22 @@ module Bosh::Stemcell
     end
 
     class Base
-      attr_reader :name, :hypervisor, :default_disk_size
+      attr_reader :name, :hypervisor, :default_disk_size, :disk_formats
 
       def initialize(options = {})
         @name = options.fetch(:name)
         @supports_light_stemcell = options.fetch(:supports_light_stemcell, false)
         @hypervisor = options.fetch(:hypervisor)
         @default_disk_size = options.fetch(:default_disk_size)
+        @disk_formats = options.fetch(:disk_formats)
+      end
+
+      def default_disk_format
+        disk_formats.first
+      end
+
+      def additional_cloud_properties
+        {}
       end
 
       def ==(other)
@@ -38,37 +47,63 @@ module Bosh::Stemcell
 
     class NullInfrastructure < Base
       def initialize
-        super(name: 'null', hypervisor: 'null', default_disk_size: -1)
+        super(name: 'null', hypervisor: 'null', default_disk_size: -1, disk_formats: [])
       end
     end
 
     class OpenStack < Base
       def initialize
-        super(name: 'openstack', hypervisor: 'kvm', default_disk_size: 3072)
+        super(name: 'openstack', hypervisor: 'kvm', default_disk_size: 3072, disk_formats: ['qcow2', 'raw'])
+      end
+
+      def additional_cloud_properties
+        {'auto_disk_config' => true}
       end
     end
 
     class Vsphere < Base
       def initialize
-        super(name: 'vsphere', hypervisor: 'esxi', default_disk_size: 3072)
+        super(name: 'vsphere', hypervisor: 'esxi', default_disk_size: 3072, disk_formats: ['ovf'])
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
       end
     end
 
     class Vcloud < Base
       def initialize
-        super(name: 'vcloud', hypervisor: 'esxi', default_disk_size: 3072)
+        super(name: 'vcloud', hypervisor: 'esxi', default_disk_size: 3072, disk_formats: ['ovf'])
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
       end
     end
 
     class Aws < Base
       def initialize
-        super(name: 'aws', hypervisor: 'xen', supports_light_stemcell: true, default_disk_size: 2048)
+        super(
+          name: 'aws',
+          hypervisor: 'xen',
+          supports_light_stemcell: true,
+          default_disk_size: 2048,
+          disk_formats: ['raw']
+        )
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
       end
     end
 
     class Warden < Base
       def initialize
-        super(name: 'warden', hypervisor: 'boshlite', default_disk_size: 2048)
+        super(name: 'warden', hypervisor: 'boshlite', default_disk_size: 2048, disk_formats: ['files'])
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
       end
     end
   end

data/lib/bosh/stemcell/stage_collection.rb

@@ -34,7 +34,7 @@ module Bosh::Stemcell
       ]
     end
 
-    def infrastructure_stages
+    def build_stemcell_image_stages
       case infrastructure
       when Infrastructure::Aws then
         aws_stages
@@ -49,34 +49,47 @@ module Bosh::Stemcell
       end
     end
 
+    def package_stemcell_stages(disk_format)
+      case disk_format
+        when 'raw' then
+          raw_package_stages
+        when 'qcow2' then
+          qcow2_package_stages
+        when 'ovf' then
+          ovf_package_stages
+        when 'files' then
+          files_package_stages
+      end
+    end
+
+    private
+
+    def_delegators :@definition, :infrastructure, :operating_system, :agent
+
     def openstack_stages
       if operating_system.instance_of?(OperatingSystem::Centos)
         centos_openstack_stages
       else
-        default_openstack_stages
+        ubuntu_openstack_stages
       end
     end
 
     def vsphere_stages
       if operating_system.instance_of?(OperatingSystem::Centos)
-        centos_vsphere_stages
+        centos_vmware_stages
       else
-        default_vsphere_stages
+        ubuntu_vmware_stages
       end
     end
 
     def vcloud_stages
       if operating_system.instance_of?(OperatingSystem::Centos)
-        centos_vcloud_stages
+        centos_vmware_stages
       else
-        default_vcloud_stages
+        ubuntu_vmware_stages
       end
     end
 
-    private
-
-    def_delegators :@definition, :infrastructure, :operating_system, :agent
-
     def centos_os_stages
       [
         :base_centos,
@@ -120,7 +133,7 @@ module Bosh::Stemcell
       ]
     end
 
-    def centos_vsphere_stages
+    def centos_vmware_stages
       [
         #:system_open_vm_tools,
         :system_vsphere_cdrom,
@@ -129,26 +142,6 @@ module Bosh::Stemcell
         :bosh_harden,
         :image_create,
         :image_install_grub,
-        :image_ovf_vmx,
-        :image_ovf_generate,
-        :image_ovf_prepare_stemcell,
-        :stemcell,
-      ]
-    end
-
-    def centos_vcloud_stages
-      [
-        #:system_open_vm_tools,
-        :system_vsphere_cdrom,
-        :system_parameters,
-        :bosh_clean,
-        :bosh_harden,
-        :image_create,
-        :image_install_grub,
-        :image_ovf_vmx,
-        :image_ovf_generate,
-        :image_ovf_prepare_stemcell,
-        :stemcell
       ]
     end
 
@@ -164,10 +157,6 @@ module Bosh::Stemcell
         :bosh_openstack_agent_settings,
         :image_create,
         :image_install_grub,
-        :image_openstack_qcow2,
-        :image_openstack_prepare_stemcell,
-        # Final stemcell
-        :stemcell_openstack,
       ]
     end
 
@@ -185,13 +174,10 @@ module Bosh::Stemcell
         :image_create,
         :image_install_grub,
         :image_aws_update_grub,
-        :image_aws_prepare_stemcell,
-        # Final stemcell
-        :stemcell,
       ]
     end
 
-    def default_openstack_stages
+    def ubuntu_openstack_stages
       [
         # Misc
         :system_openstack_network,
@@ -206,14 +192,10 @@ module Bosh::Stemcell
         # Image/bootloader
         :image_create,
         :image_install_grub,
-        :image_openstack_qcow2,
-        :image_openstack_prepare_stemcell,
-        # Final stemcell
-        :stemcell_openstack,
       ]
     end
 
-    def default_vsphere_stages
+    def ubuntu_vmware_stages
       [
         :system_open_vm_tools,
         :system_vsphere_cdrom,
@@ -225,48 +207,46 @@ module Bosh::Stemcell
         # Image/bootloader
         :image_create,
         :image_install_grub,
-        :image_ovf_vmx,
-        :image_ovf_generate,
-        :image_ovf_prepare_stemcell,
-        # Final stemcell
-        :stemcell,
       ]
     end
 
-    def default_vcloud_stages
+    def warden_stages
       [
-        :system_open_vm_tools,
-        :system_vsphere_cdrom,
-        # Misc
         :system_parameters,
+        :base_warden,
         # Finalisation
         :bosh_clean,
         :bosh_harden,
-        # Image/bootloader
+        # only used for spec test
         :image_create,
-        :image_install_grub,
+      ]
+    end
+
+    def raw_package_stages
+      [
+        :prepare_raw_image_stemcell,
+      ]
+    end
+
+    def qcow2_package_stages
+      [
+        :prepare_qcow2_image_stemcell,
+      ]
+    end
+
+    def ovf_package_stages
+      [
         :image_ovf_vmx,
         :image_ovf_generate,
-        :image_ovf_prepare_stemcell,
-        # Final stemcell
-        :stemcell
+        :prepare_ovf_image_stemcell,
       ]
     end
 
-    def warden_stages
+    def files_package_stages
       [
-        :system_parameters,
-        :base_warden,
-        # Finalisation
-        :bosh_clean,
-        :bosh_harden,
-        # Image copy
-        :bosh_copy_root,
-        # only used for spec test
-        :image_create,
-        # Final stemcell
-        :stemcell,
+        :prepare_files_image_stemcell,
       ]
     end
+
   end
 end

data/lib/bosh/stemcell/stemcell.rb

@@ -0,0 +1,22 @@
+module Bosh
+  module Stemcell
+    class Stemcell
+      attr_reader :version, :definition, :disk_format, :base_name
+
+      def initialize(definition, base_name, version, disk_format)
+        @definition = definition
+        @base_name = base_name
+        @version = version
+        @disk_format = disk_format
+      end
+
+      def infrastructure
+        @definition.infrastructure
+      end
+
+      def name
+        ArchiveFilename.new(version, definition, base_name, disk_format).to_s
+      end
+    end
+  end
+end

data/lib/bosh/stemcell/stemcell_builder.rb

@@ -1,18 +1,22 @@
+require 'fileutils'
+require 'bosh/stemcell/stage_collection'
+
 module Bosh::Stemcell
   class StemcellBuilder
     def initialize(dependencies = {})
       @gem_components = dependencies.fetch(:gem_components)
       @environment = dependencies.fetch(:environment)
-      @collection = dependencies.fetch(:collection)
       @runner = dependencies.fetch(:runner)
+      @collection = dependencies.fetch(:collection)
     end
 
     def build
       gem_components.build_release_gems
       environment.prepare_build
+
       stemcell_stages = collection.extract_operating_system_stages +
         collection.agent_stages +
-        collection.infrastructure_stages
+        collection.build_stemcell_image_stages
       runner.configure_and_apply(stemcell_stages)
     end
 

data/lib/bosh/stemcell/stemcell_packager.rb

@@ -0,0 +1,75 @@
+module Bosh
+  module Stemcell
+    class StemcellPackager
+      def initialize(definition, version, work_path, tarball_path, runner, collection)
+        @definition = definition
+        @version = version
+        @stemcell_build_path = File.join(work_path, 'stemcell')
+        @tarball_path = tarball_path
+        @runner = runner
+        @collection = collection
+      end
+
+      def package(disk_format)
+        File.delete(stemcell_image_path) if File.exist?(stemcell_image_path)
+
+        runner.configure_and_apply(collection.package_stemcell_stages(disk_format))
+
+        write_manifest(disk_format)
+        create_tarball(disk_format)
+      end
+
+      private
+
+      attr_reader :definition, :version, :stemcell_build_path, :tarball_path, :runner, :collection
+
+      def write_manifest(disk_format)
+        manifest_filename = File.join(stemcell_build_path, "stemcell.MF")
+        File.open(manifest_filename, "w") do |f|
+          f.write(Psych.dump(manifest(disk_format)))
+        end
+      end
+
+      def manifest(disk_format)
+        infrastructure = definition.infrastructure
+
+        {
+          'name' => definition.stemcell_name(disk_format),
+          'version' => version.to_s,
+          'bosh_protocol' => 1,
+          'sha1' => image_checksum,
+          'cloud_properties' => {
+            'name' => definition.stemcell_name(disk_format),
+            'version' => version.to_s,
+            'infrastructure' => infrastructure.name,
+            'hypervisor' => infrastructure.hypervisor,
+            'disk_format' => disk_format,
+            'container_format' => 'bare',
+            'os_type' => 'linux',
+            'os_distro' => definition.operating_system.name,
+            'architecture' => 'x86_64',
+          }.merge(infrastructure.additional_cloud_properties)
+        }
+      end
+
+      def create_tarball(disk_format)
+        stemcell_name = ArchiveFilename.new(version, definition, 'bosh-stemcell', disk_format).to_s
+        tarball_name = File.join(tarball_path, stemcell_name)
+
+        Dir.chdir(stemcell_build_path) do
+          system("tar zcf #{tarball_name} *")
+        end
+
+        tarball_name
+      end
+
+      def image_checksum
+        `shasum -a 1 #{stemcell_image_path}`.split(/\s/).first
+      end
+
+      def stemcell_image_path
+        File.join(stemcell_build_path, 'image')
+      end
+    end
+  end
+end

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2824.0'
+    VERSION = '1.2827.0'
   end
 end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2824.0
-  prerelease: 
+  version: 1.2827.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2824.0
+        version: 1.2827.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2824.0
+        version: 1.2827.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foodcritic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bosh::Stemcell provides tools to manage stemcells
@@ -145,6 +128,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/bosh/stemcell.rb
 - lib/bosh/stemcell/agent.rb
 - lib/bosh/stemcell/archive.rb
@@ -162,36 +146,33 @@ files:
 - lib/bosh/stemcell/os_image_builder.rb
 - lib/bosh/stemcell/stage_collection.rb
 - lib/bosh/stemcell/stage_runner.rb
+- lib/bosh/stemcell/stemcell.rb
 - lib/bosh/stemcell/stemcell_builder.rb
+- lib/bosh/stemcell/stemcell_packager.rb
 - lib/bosh/stemcell/version.rb
 - lib/monkeypatch/serverspec/backend/exec.rb
-- README.md
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3884337251874964436
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bosh::Stemcell provides tools to manage stemcells
 test_files: []