bosh-stemcell 1.2889.0 → 1.2891.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2a6ef7459587f1cff7db279bf62d32d11929f1
-  data.tar.gz: 8a34eae0f8cd1ec05b4f72397b636e9f826ee6b4
+  metadata.gz: 7752bfaf9447e67c524f637db5a33f41eebc06c8
+  data.tar.gz: 1099764b2e6b7a345075297dcf9e375d59f7781b
 SHA512:
-  metadata.gz: 1ec689fe1a2938146844d2c1c190a9c77994def83bc1d2698b288d33810d84ef11e2d58f4625094d231aef2319eaf091621e7252aaeeaae768edf41cf29c02e6
-  data.tar.gz: b6e5853950d2c6fdb27fe9b92c250c2a6eb7fc9153b628265c51f945199ccef49474481747b88a0786f424a3348d3c3872c768362c9aa3b75b2a9f92f5630801
+  metadata.gz: 7a02ee0ba7726eaca79a5f5e5985f69f9afecdd821733bc0af3c75cdd1d5863570a8f0026360b431e5deda1cbc84aa5cbe5e07ce995419323de25a0232848a52
+  data.tar.gz: d8fe484021e415bc93ed3162237a93b2bb3e34a42eae62b3d60de0c6ba35793344d5ff7cc97eb496190c75b35791a35a6d17174dd3a62d26fb9d030df6562258

data/README.md

@@ -50,7 +50,7 @@ If you have changes that will require new OS image you need to build one. A stem
 The arguments to `stemcell:build_os_image` are:
 
 1. *`operating_system_name`* identifies which type of OS to fetch. Determines which package repository and packaging tool will be used to download and assemble the files. Must match a value recognized by the  [OperatingSystem](lib/bosh/stemcell/operating_system.rb) module. Currently, only `ubuntu` and `centos` are recognized.
-2. *`operating_system_version`* an identifier that the system may use to decide which release of the OS to download. Acceptable values depend on the operating system. For `ubuntu`, use `trusty`. For `centos`, use `6.5` (which builds a CentOS 6.6 OS image) or `7`. No other combinations are presently supported.
+2. *`operating_system_version`* an identifier that the system may use to decide which release of the OS to download. Acceptable values depend on the operating system. For `ubuntu`, use `trusty`. For `centos`, use `6` or `7`. No other combinations are presently supported.
 3. *`os_image_path`* the path to write the finished OS image tarball to. If a file exists at this path already, it will be overwritten without warning.
 
 See below [Building the stemcell with local OS image](#building-the-stemcell-with-local-os-image) on how to build stemcell with the new OS image.

data/lib/bosh/stemcell/build_environment.rb

@@ -87,6 +87,10 @@ module Bosh::Stemcell
       work_path
     end
 
+    def stemcell_disk_size
+      stemcell_builder_options.image_create_disk_size
+    end
+
     def command_env
       "env #{hash_as_bash_env(proxy_settings_from_environment)}"
     end

data/lib/bosh/stemcell/builder_options.rb

@@ -34,6 +34,7 @@ module Bosh::Stemcell
 
     attr_reader(
       :stemcell_version,
+      :image_create_disk_size,
     )
 
     private
@@ -48,7 +49,6 @@ module Bosh::Stemcell
     attr_reader(
       :environment,
       :definition,
-      :image_create_disk_size,
       :bosh_micro_release_tgz_path,
       :os_image_tgz_path,
     )

data/lib/bosh/stemcell/infrastructure.rb

@@ -87,7 +87,7 @@ module Bosh::Stemcell
           name: 'aws',
           hypervisor: 'xen',
           supports_light_stemcell: true,
-          default_disk_size: 2048,
+          default_disk_size: 3072,
           disk_formats: ['raw']
         )
       end

data/lib/bosh/stemcell/stage_collection.rb

@@ -95,6 +95,7 @@ module Bosh::Stemcell
           :base_centos,
           :base_centos_packages,
           :base_ssh,
+          :bosh_sysctl,
           bosh_steps,
           :rsyslog_config,
           :delay_monit_start,

data/lib/bosh/stemcell/stemcell_packager.rb

@@ -1,13 +1,14 @@
 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
+      def initialize(options = {})
+        @definition = options.fetch(:definition)
+        @version = options.fetch(:version)
+        @stemcell_build_path = File.join(options.fetch(:work_path), 'stemcell')
+        @tarball_path = options.fetch(:tarball_path)
+        @disk_size = options.fetch(:disk_size)
+        @runner = options.fetch(:runner)
+        @collection = options.fetch(:collection)
       end
 
       def package(disk_format)
@@ -21,7 +22,7 @@ module Bosh
 
       private
 
-      attr_reader :definition, :version, :stemcell_build_path, :tarball_path, :runner, :collection
+      attr_reader :definition, :version, :stemcell_build_path, :tarball_path, :disk_size, :runner, :collection
 
       def write_manifest(disk_format)
         manifest_filename = File.join(stemcell_build_path, "stemcell.MF")
@@ -44,6 +45,7 @@ module Bosh
             'version' => version.to_s,
             'infrastructure' => infrastructure.name,
             'hypervisor' => infrastructure.hypervisor,
+            'disk' => disk_size,
             'disk_format' => disk_format,
             'container_format' => 'bare',
             'os_type' => 'linux',

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2889.0'
+    VERSION = '1.2891.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2889.0
+  version: 1.2891.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2889.0
+        version: 1.2891.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2889.0
+        version: 1.2891.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2889.0
+        version: 1.2891.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2889.0
+        version: 1.2891.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement