bosh-stemcell 1.2121.0 → 1.2124.0

data/lib/bosh/stemcell/builder_command.rb

@@ -83,7 +83,14 @@ module Bosh::Stemcell
     end
 
     def exclude_exclusions
-      infrastructure.name == 'vsphere' ? ' --tag ~exclude_on_vsphere' : ''
+      case infrastructure.name
+        when 'vsphere'
+          ' --tag ~exclude_on_vsphere'
+        when 'vcloud'
+          ' --tag ~exclude_on_vcloud'
+        else
+          ''
+      end
     end
 
     def image_file_path

data/lib/bosh/stemcell/builder_options.rb

@@ -35,7 +35,7 @@ module Bosh::Stemcell
         'bosh_agent_src_dir' => File.join(source_root, 'bosh_agent'),
         'go_agent_src_dir' => File.join(source_root, 'go_agent'),
         'image_create_disk_size' => image_create_disk_size
-      }.merge(bosh_micro_options).merge(environment_variables).merge(vsphere_options)
+      }.merge(bosh_micro_options).merge(environment_variables).merge(ovf_options)
     end
 
     private
@@ -55,9 +55,9 @@ module Bosh::Stemcell
       :bosh_micro_release_tgz_path
     )
 
-    def vsphere_options
-      if infrastructure.name == 'vsphere'
-        { 'image_vsphere_ovf_ovftool_path' => environment['OVFTOOL'] }
+    def ovf_options
+      if infrastructure.name == 'vsphere' || infrastructure.name == 'vcloud'
+        { 'image_ovftool_path' => environment['OVFTOOL'] }
       else
         {}
       end

data/lib/bosh/stemcell/infrastructure.rb

@@ -8,6 +8,8 @@ module Bosh::Stemcell
           Aws.new
         when 'vsphere'
           Vsphere.new
+        when 'vcloud'
+          Vcloud.new
         else
           raise ArgumentError.new("invalid infrastructure: #{name}")
       end
@@ -47,6 +49,12 @@ module Bosh::Stemcell
       end
     end
 
+    class Vcloud < Base
+      def initialize
+        super(name: 'vcloud', hypervisor: 'esxi', default_disk_size: 3072)
+      end
+    end
+
     class Aws < Base
       def initialize
         super(name: 'aws', hypervisor: 'xen', supports_light_stemcell: true, default_disk_size: 2048)

data/lib/bosh/stemcell/stage_collection.rb

@@ -49,17 +49,35 @@ module Bosh::Stemcell
         when Infrastructure::Aws then
           aws_stages
         when Infrastructure::OpenStack then
-          if operating_system.instance_of?(OperatingSystem::Centos)
-            centos_openstack_stages
-          else
-            openstack_stages
-          end
+          openstack_stages
         when Infrastructure::Vsphere then
-          if operating_system.instance_of?(OperatingSystem::Centos)
-            centos_vsphere_stages
-          else
-            vsphere_stages
-          end
+          vsphere_stages
+        when Infrastructure::Vcloud then
+          vcloud_stages
+      end
+    end
+
+    def openstack_stages
+      if operating_system.instance_of?(OperatingSystem::Centos)
+        centos_openstack_stages
+      else
+        default_openstack_stages
+      end
+    end
+
+    def vsphere_stages
+      if operating_system.instance_of?(OperatingSystem::Centos)
+        centos_vsphere_stages
+      else
+        default_vsphere_stages
+      end
+    end
+
+    def vcloud_stages
+      if operating_system.instance_of?(OperatingSystem::Centos)
+        centos_vcloud_stages
+      else
+        default_vcloud_stages
       end
     end
 
@@ -100,13 +118,29 @@ module Bosh::Stemcell
         :bosh_harden,
         :image_create,
         :image_install_grub,
-        :image_vsphere_vmx,
-        :image_vsphere_ovf,
-        :image_vsphere_prepare_stemcell,
+        :image_ovf_vmx,
+        :image_ovf_generate,
+        :image_ovf_prepare_stemcell,
         :stemcell,
       ]
     end
 
+    def centos_vcloud_stages
+      [
+        #:system_open_vm_tools,
+        :system_vsphere_cdrom,
+        :system_parameters,
+        :bosh_clean,
+        :bosh_harden,
+        :image_create,
+        :image_install_grub,
+        :image_ovf_vmx,
+        :image_ovf_generate,
+        :image_ovf_prepare_stemcell,
+        :stemcell
+      ]
+    end
+
     def centos_openstack_stages
       [
         # Misc
@@ -145,7 +179,7 @@ module Bosh::Stemcell
       ]
     end
 
-    def openstack_stages
+    def default_openstack_stages
       [
         # Misc
         :system_openstack_network,
@@ -166,7 +200,7 @@ module Bosh::Stemcell
       ]
     end
 
-    def vsphere_stages
+    def default_vsphere_stages
       [
         :system_open_vm_tools,
         :system_vsphere_cdrom,
@@ -178,12 +212,32 @@ module Bosh::Stemcell
         # Image/bootloader
         :image_create,
         :image_install_grub,
-        :image_vsphere_vmx,
-        :image_vsphere_ovf,
-        :image_vsphere_prepare_stemcell,
+        :image_ovf_vmx,
+        :image_ovf_generate,
+        :image_ovf_prepare_stemcell,
         # Final stemcell
         :stemcell,
       ]
     end
+
+    def default_vcloud_stages
+      [
+        :system_open_vm_tools,
+        :system_vsphere_cdrom,
+        # Misc
+        :system_parameters,
+        # Finalisation
+        :bosh_clean,
+        :bosh_harden,
+        # Image/bootloader
+        :image_create,
+        :image_install_grub,
+        :image_ovf_vmx,
+        :image_ovf_generate,
+        :image_ovf_prepare_stemcell,
+        # Final stemcell
+        :stemcell
+      ]
+    end
   end
 end

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2121.0'
+    VERSION = '1.2124.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2121.0
+  version: 1.2124.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 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.2121.0
+        version: 1.2124.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2121.0
+        version: 1.2124.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 449191449963614115
+      hash: 593950561922831553
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23