bosh-stemcell 1.2902.0 → 1.2905.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76bde8475a4210e1fd35c457fb02eb8f6884ff0c
-  data.tar.gz: 52d550bc951f06e4c8e087b49fda9d9fcb15cae5
+  metadata.gz: f7c872da86e9de36279c5bae453ad95f947f04b3
+  data.tar.gz: 278a1d681113be28bda7c92dcf3746190c25ccbe
 SHA512:
-  metadata.gz: 84b7f9f0130228ad82e9bd3ef1a4ffbee30f1e664feddbab614265301920e85f9c707eb7759c1eab4752b285214ac719a8fce55a5f20cadaf176ad1968d35777
-  data.tar.gz: 9e68b7fc8e145b343731057ed50943cc259a885c4ed3de17e8ad4bdb325256f1b6175a31cbe244d66dd7139e49a456f33e105be5c950233c0bc68bcfd303b127
+  metadata.gz: 18ea9bb338dfbedb6820e43468c4a1825e8926920dfb1440a6724a5dd574cf747bd4a4aa911bd4f284c097f876a8016ce35ba4ff2a06f2a0f44074628a66ef15
+  data.tar.gz: f73524ea57b4a6328d0aed5fb066fc9650e117d93fa4971f9a1dc24bbb43270df2df2c381152baf52d13d274cb22762691816b19945ba986425896da0cc8e990

data/README.md

@@ -35,6 +35,16 @@ With existing stemcell building VM run:
     cd bosh-stemcell
     vagrant provision remote
 
+## Configure your local ssh and scp to communicate with the stemcell building VM
+
+Once the stemcell builing machine is up, run:
+
+    vagrant ssh-config remote
+
+Then copy the resulting output into your `~/.ssh/config` file.
+
+Once this has been done, you can ssh into the stemcell building machine with `ssh remote`
+and you can copy files to and from it using `scp localfile remote:/path/to/destination`
 
 ## Build an OS image
 
@@ -49,10 +59,31 @@ 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` or `7`. No other combinations are presently supported.
+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/operatingsystem.rb) module. Currently, `ubuntu` `centos` and `rhel` 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` or `7`. For `rhel`, use `7`.
 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.
 
+### Special requirements for building a RHEL OS image
+
+There are a few extra steps you need to do before building a RHEL OS image:
+
+1. Start up or re-provision the stemcell building machine (run `vagrant up` or `vagrant provision` from this directory)
+2. Download the RHEL 7 install DVD image and use `scp` to copy it to the stemcell building machine
+3. On the stemcell building machine, mount the RHEL 7 DVD at `/mnt/rhel`:
+
+        # mkdir -p /mnt/rhel
+        # mount rhel-server-7.0-x86_64-dvd.iso /mnt/rhel
+
+4. On the stemcell building machine, put your Red Hat Account username and password into environment variables:
+
+        $ export RHN_USERNAME=my-rh-username@company.com
+        $ export RHN_PASSWORD=my-password
+
+5. On the stemcell building machine, run the stemcell building rake task:
+
+        $ cd /bosh
+        $ bundle exec rake stemcell:build_os_image[rhel,7,/tmp/rhel_7_base_image.tgz]
+
 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.
 
 ## Building a stemcell

data/lib/bosh/stemcell/build_environment.rb

@@ -43,8 +43,6 @@ module Bosh::Stemcell
         "cd #{STEMCELL_SPECS_DIR};",
         "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

data/lib/bosh/stemcell/builder_options.rb

@@ -65,6 +65,8 @@ module Bosh::Stemcell
       {
         'UBUNTU_ISO' => environment['UBUNTU_ISO'],
         'UBUNTU_MIRROR' => environment['UBUNTU_MIRROR'],
+        'RHN_USERNAME' => environment['RHN_USERNAME'],
+        'RHN_PASSWORD' => environment['RHN_PASSWORD'],
       }
     end
 

data/lib/bosh/stemcell/operating_system.rb

@@ -4,6 +4,7 @@ module Bosh::Stemcell
     def self.for(operating_system_name, operating_system_version = nil)
       case operating_system_name
         when 'centos' then Centos.new(operating_system_version)
+        when 'rhel' then Rhel.new(operating_system_version)
         when 'ubuntu' then Ubuntu.new(operating_system_version)
         else raise ArgumentError.new("invalid operating system: #{operating_system_name}")
       end
@@ -22,6 +23,12 @@ module Bosh::Stemcell
       end
     end
 
+    class Rhel < Base
+      def initialize(version)
+        super(name: 'rhel', version: version)
+      end
+    end
+
     class Centos < Base
       def initialize(version)
         super(name: 'centos', version: version)

data/lib/bosh/stemcell/stage_collection.rb

@@ -11,10 +11,12 @@ module Bosh::Stemcell
 
     def operating_system_stages
       case operating_system
-      when OperatingSystem::Centos then
-        centos_os_stages
-      when OperatingSystem::Ubuntu then
-        ubuntu_os_stages
+        when OperatingSystem::Centos then
+          centos_os_stages
+        when OperatingSystem::Rhel then
+          rhel_os_stages
+        when OperatingSystem::Ubuntu then
+          ubuntu_os_stages
       end
     end
 
@@ -67,7 +69,7 @@ module Bosh::Stemcell
     def_delegators :@definition, :infrastructure, :operating_system, :agent
 
     def openstack_stages
-      if operating_system.instance_of?(OperatingSystem::Centos)
+      if operating_system.instance_of?(OperatingSystem::Centos) || operating_system.instance_of?(OperatingSystem::Rhel)
         centos_openstack_stages
       else
         ubuntu_openstack_stages
@@ -95,7 +97,6 @@ module Bosh::Stemcell
           :base_centos,
           :base_centos_packages,
           :base_ssh,
-          :bosh_sysctl,
           bosh_steps,
           :rsyslog_config,
           :delay_monit_start,
@@ -109,6 +110,19 @@ module Bosh::Stemcell
       os_stages
     end
 
+    def rhel_os_stages
+      [
+        :base_rhel,
+        :base_centos_packages,
+        :base_ssh,
+        bosh_steps,
+        :rsyslog_config,
+        :delay_monit_start,
+        :system_grub,
+        :rhel_unsubscribe,
+      ].flatten
+    end
+
     def ubuntu_os_stages
       [
         :base_debootstrap,
@@ -119,7 +133,6 @@ module Bosh::Stemcell
         :base_ssh,
         :bosh_dpkg_list,
         :bosh_sysstat,
-        :bosh_sysctl,
         :system_kernel,
         bosh_steps,
         :rsyslog_build,
@@ -132,6 +145,7 @@ module Bosh::Stemcell
 
     def bosh_steps
       [
+          :bosh_sysctl,
           :bosh_users,
           :bosh_monit,
           :bosh_ntpdate,

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2902.0'
+    VERSION = '1.2905.0'
   end
 end

metadata

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