bosh-stemcell 1.2915.0 → 1.2922.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b9f47832ea080701b97cf20d67d85fbb9e9f91
-  data.tar.gz: bff1a1d1470d3426f74e1ea8c7fbc8e4a3f56975
+  metadata.gz: e63abd8e3e4094e14eb2055f037830ebf0fdfb8b
+  data.tar.gz: 4adef86bd8f5af990a1bd68f19a487e22f89c99a
 SHA512:
-  metadata.gz: 292d8754ef6acd4af6ca939bfc1ec7a9bdf767de28d41a555f0ceba80961cc6799db3aa8820c5a989ff0c71e84564547393afc9714856d0d396dfa5cf130a05b
-  data.tar.gz: 473de17cebc3663ec16555b43dae124fb9bbf2774f0a48fc90ce5fee8f8a434faa90555b3d0b3dea4b0b4ce522eb022606088217ce6c4589f44d375ddf003cd5
+  metadata.gz: 883740b6c50493eb018fad4ec6cf2c3012c46aff7d5e4c0aad8f4e7dd9ca645a8715bac54c254e0eae4f654cd7e214abd0e1de59951f720feec68ca194a25087
+  data.tar.gz: 317890a2a52246297e56c4b87d1b5cd7800e7dfd58d652d295727be725822acf4ba7b0283187635119c9ce51b2655dd2553cd46bf390f3c1d42c34398aa3b657

data/lib/bosh/stemcell/stage_collection.rb

@@ -1,6 +1,7 @@
 require 'bosh/stemcell/definition'
 require 'forwardable'
 
+# rubocop:disable MethodLength
 module Bosh::Stemcell
   class StageCollection
     extend Forwardable
@@ -69,29 +70,128 @@ module Bosh::Stemcell
     def_delegators :@definition, :infrastructure, :operating_system, :agent
 
     def openstack_stages
-      if operating_system.instance_of?(OperatingSystem::Centos) || operating_system.instance_of?(OperatingSystem::Rhel)
-        centos_openstack_stages
+      if is_centos? || is_rhel?
+        [
+          :system_network,
+          # Misc
+          :system_parameters,
+          # Finalisation,
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_disable_password_authentication,
+          :bosh_openstack_agent_settings,
+          :image_create,
+          :image_install_grub,
+        ]
       else
-        ubuntu_openstack_stages
+        [
+          :system_network,
+          # Misc
+          :system_openstack_clock,
+          :system_openstack_modules,
+          :system_parameters,
+          # Finalisation,
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_disable_password_authentication,
+          :bosh_openstack_agent_settings,
+          # Image/bootloader
+          :image_create,
+          :image_install_grub,
+        ]
       end
     end
 
     def vsphere_stages
-      if operating_system.instance_of?(OperatingSystem::Centos)
-        centos_vmware_stages
+      if is_centos?
+        [
+          :system_network,
+          :system_vsphere_cdrom,
+          :system_parameters,
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_vsphere_agent_settings,
+          :image_create,
+          :image_install_grub,
+        ]
       else
-        ubuntu_vmware_stages
+        [
+          :system_network,
+          :system_open_vm_tools,
+          :system_vsphere_cdrom,
+          # Misc
+          :system_parameters,
+          # Finalisation
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_vsphere_agent_settings,
+          # Image/bootloader
+          :image_create,
+          :image_install_grub,
+        ]
       end
     end
 
     def vcloud_stages
-      if operating_system.instance_of?(OperatingSystem::Centos)
-        centos_vmware_stages
+      if is_centos?
+        [
+          :system_network,
+          :system_vsphere_cdrom,
+          :system_parameters,
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_vsphere_agent_settings,
+          :image_create,
+          :image_install_grub,
+        ]
       else
-        ubuntu_vmware_stages
+        [
+          :system_network,
+          :system_open_vm_tools,
+          :system_vsphere_cdrom,
+          # Misc
+          :system_parameters,
+          # Finalisation
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_vsphere_agent_settings,
+          # Image/bootloader
+          :image_create,
+          :image_install_grub,
+        ]
       end
     end
 
+    def aws_stages
+      [
+        # Misc
+        :system_network,
+        :system_aws_modules,
+        :system_parameters,
+        # Finalisation
+        :bosh_clean,
+        :bosh_harden,
+        :bosh_disable_password_authentication,
+        :bosh_aws_agent_settings,
+        # Image/bootloader
+        :image_create,
+        :image_install_grub,
+        :image_aws_update_grub,
+      ]
+    end
+
+    def warden_stages
+      [
+        :system_parameters,
+        :base_warden,
+        # Finalisation
+        :bosh_clean,
+        :bosh_harden,
+        # only used for spec test
+        :image_create,
+      ]
+    end
+
     def centos_os_stages
       os_stages = [
           :base_centos,
@@ -153,98 +253,6 @@ module Bosh::Stemcell
       ]
     end
 
-    def centos_vmware_stages
-      [
-        #:system_open_vm_tools,
-        :system_vsphere_cdrom,
-        :system_parameters,
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_vsphere_agent_settings,
-        :image_create,
-        :image_install_grub,
-      ]
-    end
-
-    def centos_openstack_stages
-      [
-        # Misc
-        :system_openstack_network_centos,
-        :system_parameters,
-        # Finalisation,
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_disable_password_authentication,
-        :bosh_openstack_agent_settings,
-        :image_create,
-        :image_install_grub,
-      ]
-    end
-
-    def aws_stages
-      [
-        # Misc
-        :system_aws_network,
-        :system_aws_modules,
-        :system_parameters,
-        # Finalisation
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_disable_password_authentication,
-        :bosh_aws_agent_settings,
-        # Image/bootloader
-        :image_create,
-        :image_install_grub,
-        :image_aws_update_grub,
-      ]
-    end
-
-    def ubuntu_openstack_stages
-      [
-        # Misc
-        :system_openstack_network,
-        :system_openstack_clock,
-        :system_openstack_modules,
-        :system_parameters,
-        # Finalisation,
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_disable_password_authentication,
-        :bosh_openstack_agent_settings,
-        # Image/bootloader
-        :image_create,
-        :image_install_grub,
-      ]
-    end
-
-    def ubuntu_vmware_stages
-      [
-        :system_open_vm_tools,
-        :system_vsphere_cdrom,
-        # Misc
-        :system_parameters,
-        # Finalisation
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_vsphere_agent_settings,
-        # Image/bootloader
-        :image_create,
-        :image_install_grub,
-      ]
-    end
-
-    def warden_stages
-      [
-        :system_parameters,
-        :base_warden,
-        # Finalisation
-        :bosh_clean,
-        :bosh_harden,
-        # only used for spec test
-        :image_create,
-      ]
-    end
-
     def raw_package_stages
       [
         :prepare_raw_image_stemcell,
@@ -271,5 +279,12 @@ module Bosh::Stemcell
       ]
     end
 
+    def is_centos?
+      operating_system.instance_of?(OperatingSystem::Centos)
+    end
+
+    def is_rhel?
+      operating_system.instance_of?(OperatingSystem::Rhel)
+    end
   end
 end

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2915.0'
+    VERSION = '1.2922.0'
   end
 end

metadata

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