bosh-stemcell 1.1750.0 → 1.1761.0

data/lib/bosh/stemcell/stage_collection.rb

@@ -38,9 +38,9 @@ module Bosh::Stemcell
     def operating_system_stages
       case operating_system
         when OperatingSystem::Centos then
-          [:base_centos, :base_yum] + hacked_centos_common
+          centos_os_stages + common_os_stages
         when OperatingSystem::Ubuntu then
-          [:base_debootstrap, :base_apt, :bosh_dpkg_list] + common_stages
+          ubuntu_os_stages + common_os_stages
       end
     end
 
@@ -49,28 +49,49 @@ module Bosh::Stemcell
         when Infrastructure::Aws then
           aws_stages
         when Infrastructure::OpenStack then
-          operating_system.instance_of?(OperatingSystem::Centos) ? hacked_centos_openstack : openstack_stages
+          if operating_system.instance_of?(OperatingSystem::Centos)
+            centos_openstack_stages
+          else
+            openstack_stages
+          end
         when Infrastructure::Vsphere then
-          operating_system.instance_of?(OperatingSystem::Centos) ? hacked_centos_vsphere : vsphere_stages
+          if operating_system.instance_of?(OperatingSystem::Centos)
+            centos_vsphere_stages
+          else
+            vsphere_stages
+          end
       end
     end
 
-    def hacked_centos_common
+    def centos_os_stages
+      [:base_centos, :base_yum]
+    end
+
+    def ubuntu_os_stages
+      [
+        :base_debootstrap,
+        :base_apt,
+        :bosh_dpkg_list,
+        :bosh_sysstat,
+        :bosh_sysctl,
+        :system_kernel,
+      ]
+    end
+
+    def common_os_stages
       [
         # Bosh steps
         :bosh_users,
         :bosh_monit,
-        #:bosh_sysstat,
-        #:bosh_sysctl,
         :bosh_ntpdate,
         :bosh_sudoers,
+        :rsyslog,
         # Install GRUB/kernel/etc
         :system_grub,
-      #:system_kernel,
       ]
     end
 
-    def hacked_centos_vsphere
+    def centos_vsphere_stages
       [
         #:system_open_vm_tools,
         :system_parameters,
@@ -81,11 +102,11 @@ module Bosh::Stemcell
         :image_vsphere_vmx,
         :image_vsphere_ovf,
         :image_vsphere_prepare_stemcell,
-        :stemcell
+        :stemcell,
       ]
     end
 
-    def hacked_centos_openstack
+    def centos_openstack_stages
       [
         # Misc
         :system_openstack_network_centos,
@@ -99,23 +120,7 @@ module Bosh::Stemcell
         :image_openstack_qcow2,
         :image_openstack_prepare_stemcell,
         # Final stemcell
-        :stemcell_openstack
-      ]
-    end
-
-    def common_stages
-      [
-        # Bosh steps
-        :bosh_users,
-        :bosh_monit,
-        :bosh_sysstat,
-        :bosh_sysctl,
-        :bosh_ntpdate,
-        :bosh_sudoers,
-        :rsyslog,
-        # Install GRUB/kernel/etc
-        :system_grub,
-        :system_kernel,
+        :stemcell_openstack,
       ]
     end
 
@@ -135,7 +140,7 @@ module Bosh::Stemcell
         :image_aws_update_grub,
         :image_aws_prepare_stemcell,
         # Final stemcell
-        :stemcell
+        :stemcell,
       ]
     end
 
@@ -156,7 +161,7 @@ module Bosh::Stemcell
         :image_openstack_qcow2,
         :image_openstack_prepare_stemcell,
         # Final stemcell
-        :stemcell_openstack
+        :stemcell_openstack,
       ]
     end
 
@@ -175,7 +180,7 @@ module Bosh::Stemcell
         :image_vsphere_ovf,
         :image_vsphere_prepare_stemcell,
         # Final stemcell
-        :stemcell
+        :stemcell,
       ]
     end
   end

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.1750.0'
+    VERSION = '1.1761.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.1750.0
+  version: 1.1761.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2283785670934643133
+      hash: -2971511911375545563
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23