bosh-stemcell 1.2881.0 → 1.2889.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 088896224dc4a7ccf85ecaa586ebdcb8ec23147a
-  data.tar.gz: 6b161556654c8d3f34ecc2673a2f777c03113b85
+  metadata.gz: ba2a6ef7459587f1cff7db279bf62d32d11929f1
+  data.tar.gz: 8a34eae0f8cd1ec05b4f72397b636e9f826ee6b4
 SHA512:
-  metadata.gz: 9679c0ff11d0da4b7c1960924cad91b06e5184cf4392f89aa0baa86e384320e12cec5ea75d290a0ece26da182cd4fe0ac75628cc5662fcd7a8243aa5264d1ca4
-  data.tar.gz: e904b130eca5edebfc70dea59e2a550db9d24a0c73292857095ae988076cbd3a0f745bc3d110074d6be4e0f775494e7587b360c3d29a44bf7eeb9869f6475738
+  metadata.gz: 1ec689fe1a2938146844d2c1c190a9c77994def83bc1d2698b288d33810d84ef11e2d58f4625094d231aef2319eaf091621e7252aaeeaae768edf41cf29c02e6
+  data.tar.gz: b6e5853950d2c6fdb27fe9b92c250c2a6eb7fc9153b628265c51f945199ccef49474481747b88a0786f424a3348d3c3872c768362c9aa3b75b2a9f92f5630801

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`, the value is currently ignored.
+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.
 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.
@@ -91,3 +91,23 @@ AWS stemcells can be shipped in light format which includes a reference to a pub
       export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
       bundle exec rake stemcell:build_light[/tmp/bosh-stemcell.tgz,hvm]
     ' remote
+
+### When things go sideways
+
+If you find yourself debugging any of the above processes, here is what you need to know:
+
+1. Most of the action happens in Bash scripts, which are referred to as _stages_, and can
+   be found in `stemcell_builder/stages/<stage_name>/apply.sh`.
+2. You should make all changes on your local machine, and sync them over to the AWS stemcell
+   building machine using `vagrant provision remote` as explained earlier on this page.
+3. While debugging a particular stage that is failing, you can resume the process from that
+   stage by adding `resume_from=<stage_name>` to the end of your `bundle exec rake` command.
+   When a stage's `apply.sh` fails, you should see a message of the form
+   `Can't find stage '<stage>' to resume from. Aborting.` so you know which stage failed and
+   where you can resume from after fixing the problem.
+
+   For example:
+
+   ```
+   bundle exec rake stemcell:build_os_image[ubuntu,trusty,/tmp/ubuntu_base_image.tgz] resume_from=rsyslog_build
+   ```

data/lib/bosh/stemcell/build_environment.rb

@@ -28,8 +28,10 @@ module Bosh::Stemcell
     attr_reader :version
 
     def prepare_build
-      sanitize
-      prepare_build_path
+      if (ENV['resume_from'] == NIL)
+        sanitize
+        prepare_build_path
+      end
       copy_stemcell_builder_to_build_path
       prepare_work_root
       prepare_stemcell_path
@@ -42,6 +44,7 @@ module Bosh::Stemcell
         "OS_IMAGE=#{os_image_tarball_path}",
         'bundle exec rspec -fd',
         "spec/os_image/common_spec.rb",
+        "spec/os_image/#{operating_system.name}_common_spec.rb",
         "spec/os_image/#{operating_system_spec_name}_spec.rb",
       ].join(' ')
     end
@@ -117,11 +120,7 @@ module Bosh::Stemcell
     end
 
     def operating_system_spec_name
-      spec_name = operating_system.name
-      if operating_system.version
-        spec_name = "#{spec_name}_#{operating_system.version}"
-      end
-      spec_name
+      "#{operating_system.name}_#{operating_system.version}"
     end
 
     def prepare_build_path

data/lib/bosh/stemcell/operating_system.rb

@@ -1,8 +1,9 @@
 module Bosh::Stemcell
   module OperatingSystem
+
     def self.for(operating_system_name, operating_system_version = nil)
       case operating_system_name
-        when 'centos' then Centos.new
+        when 'centos' then Centos.new(operating_system_version)
         when 'ubuntu' then Ubuntu.new(operating_system_version)
         else raise ArgumentError.new("invalid operating system: #{operating_system_name}")
       end
@@ -13,7 +14,7 @@ module Bosh::Stemcell
 
       def initialize(options = {})
         @name = options.fetch(:name)
-        @version = options.fetch(:version, nil)
+        @version = options.fetch(:version)
       end
 
       def ==(other)
@@ -22,8 +23,8 @@ module Bosh::Stemcell
     end
 
     class Centos < Base
-      def initialize
-        super(name: 'centos')
+      def initialize(version)
+        super(name: 'centos', version: version)
       end
     end
 

data/lib/bosh/stemcell/os_image_builder.rb

@@ -9,7 +9,7 @@ module Bosh::Stemcell
 
     def build(os_image_path)
       environment.prepare_build
-      runner.configure_and_apply(collection.operating_system_stages)
+      runner.configure_and_apply(collection.operating_system_stages, ENV['resume_from'])
       archive_handler.compress(environment.chroot_dir, os_image_path)
     end
 

data/lib/bosh/stemcell/stage_collection.rb

@@ -91,20 +91,21 @@ module Bosh::Stemcell
     end
 
     def centos_os_stages
-      [
-        :base_centos,
-        :base_centos_packages,
-        :base_ssh,
-        # Bosh steps
-        :bosh_users,
-        :bosh_monit,
-        :bosh_ntpdate,
-        :bosh_sudoers,
-        :rsyslog,
-        :delay_monit_start,
-        # Install GRUB/kernel/etc
-        :system_grub,
-      ]
+      os_stages = [
+          :base_centos,
+          :base_centos_packages,
+          :base_ssh,
+          bosh_steps,
+          :rsyslog_config,
+          :delay_monit_start,
+          :system_grub,
+      ].flatten
+
+      if operating_system.version.to_f < 7
+        os_stages.insert(os_stages.index(:rsyslog_config),:rsyslog_build)
+      end
+
+      os_stages
     end
 
     def ubuntu_os_stages
@@ -119,17 +120,21 @@ module Bosh::Stemcell
         :bosh_sysstat,
         :bosh_sysctl,
         :system_kernel,
-        # Bosh steps
-        :bosh_users,
-        :bosh_monit,
-        :bosh_ntpdate,
-        :bosh_sudoers,
-        :rsyslog,
+        bosh_steps,
+        :rsyslog_build,
+        :rsyslog_config,
         :delay_monit_start,
-        # Install GRUB/kernel/etc
         :system_grub,
-        # Symlink vim to vim.tiny
         :vim_tiny,
+      ].flatten
+    end
+
+    def bosh_steps
+      [
+          :bosh_users,
+          :bosh_monit,
+          :bosh_ntpdate,
+          :bosh_sudoers,
       ]
     end
 

data/lib/bosh/stemcell/stage_runner.rb

@@ -9,7 +9,8 @@ module Bosh::Stemcell
       @work_path = options.fetch(:work_path)
     end
 
-    def configure_and_apply(stages)
+    def configure_and_apply(stages, resume_from_stage = nil)
+      stages = resume_from(stages, resume_from_stage)
       configure(stages)
       apply(stages)
     end
@@ -33,9 +34,16 @@ module Bosh::Stemcell
         puts "=== Applying '#{stage}' stage ==="
         puts "== Started #{Time.now.strftime('%a %b %e %H:%M:%S %Z %Y')} =="
 
-        stage_apply_script = File.join(build_path, 'stages', stage.to_s, 'apply.sh')
+        begin
+          stage_apply_script = File.join(build_path, 'stages', stage.to_s, 'apply.sh')
+
+          run_sudo_with_command_env("#{stage_apply_script} #{work_path}")
+
+        rescue => _
+          puts "=== You can resume_from the '#{stage}' stage by using resume_from=#{stage} ==="
+          raise
+        end
 
-        run_sudo_with_command_env("#{stage_apply_script} #{work_path}")
       end
     end
 
@@ -43,6 +51,18 @@ module Bosh::Stemcell
 
     attr_reader :stages, :build_path, :command_env, :settings_file, :work_path
 
+    def resume_from(all_stages, resume_from_stage)
+      if resume_from_stage != NIL
+        stage_index = all_stages.index(resume_from_stage.to_sym)
+        if stage_index == NIL
+          raise "Can't find stage '#{resume_from_stage}' to resume from. Aborting."
+        end
+        all_stages.drop(stage_index)
+      else
+        all_stages
+      end
+    end
+
     def run_sudo_with_command_env(command)
       shell = Bosh::Core::Shell.new
 

data/lib/bosh/stemcell/stemcell_builder.rb

@@ -17,7 +17,7 @@ module Bosh::Stemcell
       stemcell_stages = collection.extract_operating_system_stages +
         collection.agent_stages +
         collection.build_stemcell_image_stages
-      runner.configure_and_apply(stemcell_stages)
+      runner.configure_and_apply(stemcell_stages, ENV['resume_from'])
     end
 
     private

data/lib/bosh/stemcell/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2881.0
+  version: 1.2889.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-19 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.2881.0
+        version: 1.2889.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2881.0
+        version: 1.2889.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement