bosh-stemcell 1.3130.0 → 1.3137.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867e11511075e3aa627cc0b5d655538791e96025
-  data.tar.gz: 1461ebf36af32b878e9011668b3b6e1c95fa4b20
+  metadata.gz: 98381535bdb5531edab4ec928eaa9a1234d472c3
+  data.tar.gz: 33276a1a1bb0e7e4ad971df221bee37bdeb8d351
 SHA512:
-  metadata.gz: 9ee57ec160f46b64de853816365a68db6b2c31e2555441e3c3cdf22d47602ed1defa6b3a58c3154112bb4d20a57c1c514e76bbb0e1c5e84aad60c1f478847ae8
-  data.tar.gz: 262a579143f084c3be0b0096cc391e67392bca33344d3657dc7af32d1ca5deef8728ae2bf8e2121db82a524d5f210ada87d01c23b412c07767de07c555d86d78
+  metadata.gz: fa50963622002b559bf11f4afa5a7440c073a63cf4ee0379d9aa5a80190f1924a48e1f407278db0cd4673f5c3b36eda13c6727f1c568f0eaf9d12c1ab347c4fe
+  data.tar.gz: e4e96d9cfe249f7463729153d9ca3f48e86e4849e4f2418eef536bb97e300c1ad1164cb378dc5ac341b096bea954bb582de006d9f17a7bff05e687a817fe25a1

data/lib/bosh/stemcell/build_environment.rb

@@ -167,6 +167,8 @@ module Bosh::Stemcell
         ' --tag ~exclude_on_aws'
       when 'openstack'
         ' --tag ~exclude_on_openstack'
+      when 'azure'
+        ' --tag ~exclude_on_azure'
       else
         ''
       end

data/lib/bosh/stemcell/infrastructure.rb

@@ -12,6 +12,8 @@ module Bosh::Stemcell
           Warden.new
         when 'vcloud'
           Vcloud.new
+        when 'azure'
+          Azure.new
         when 'null'
           NullInfrastructure.new
         else
@@ -106,5 +108,15 @@ module Bosh::Stemcell
         {'root_device_name' => '/dev/sda1'}
       end
     end
+
+    class Azure < Base
+      def initialize
+        super(name: 'azure', hypervisor: 'hyperv', default_disk_size: 3072, disk_formats: ['vhd'])
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
+      end
+    end
   end
 end

data/lib/bosh/stemcell/stage_collection.rb

@@ -46,11 +46,13 @@ module Bosh::Stemcell
       when Infrastructure::OpenStack then
         openstack_stages
       when Infrastructure::Vsphere then
-        vsphere_stages
+        vsphere_vcloud_stages
       when Infrastructure::Vcloud then
-        vcloud_stages
+        vsphere_vcloud_stages
       when Infrastructure::Warden then
         warden_stages
+      when Infrastructure::Azure then
+        azure_stages
       end
 
       stages.concat(finish_stemcell_stages)
@@ -64,6 +66,8 @@ module Bosh::Stemcell
           qcow2_package_stages
         when 'ovf' then
           ovf_package_stages
+        when 'vhd' then
+          vhd_package_stages
         when 'files' then
           files_package_stages
       end
@@ -74,132 +78,55 @@ module Bosh::Stemcell
     def_delegators :@definition, :infrastructure, :operating_system, :agent
 
     def openstack_stages
-      if is_centos? || is_rhel?
+      stages = if is_centos? || is_rhel?
         [
           :system_network,
-          # Misc
-          :system_parameters,
-          # Finalisation,
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_disable_password_authentication,
-          :bosh_openstack_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          :image_create,
-          :image_install_grub,
         ]
       else
         [
           :system_network,
-          # Misc
           :system_openstack_clock,
           :system_openstack_modules,
-          :system_parameters,
-          # Finalisation,
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_disable_password_authentication,
-          :bosh_openstack_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          # Image/bootloader
-          :image_create,
-          :image_install_grub,
         ]
       end
-    end
 
-    def finish_stemcell_stages
-      [
-        :bosh_package_list
+      stages += [
+        :system_parameters,
+        :bosh_clean,
+        :bosh_harden,
+        :bosh_openstack_agent_settings,
+        :bosh_clean_ssh,
+        :image_create,
+        :image_install_grub,
       ]
     end
 
-    def vsphere_stages
-      if is_centos?
-        [
-          :system_network,
-          :system_open_vm_tools,
-          :system_vsphere_cdrom,
-          :system_parameters,
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_vsphere_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          :image_create,
-          :image_install_grub,
-        ]
-      else
-        [
-          :system_network,
-          :system_open_vm_tools,
-          :system_vsphere_cdrom,
-          # Misc
-          :system_parameters,
-          # Finalisation
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_vsphere_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          # Image/bootloader
-          :image_create,
-          :image_install_grub,
-        ]
-      end
-    end
-
-    def vcloud_stages
-      if is_centos?
-        [
-          :system_network,
-          :system_open_vm_tools,
-          :system_vsphere_cdrom,
-          :system_parameters,
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_vsphere_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          :image_create,
-          :image_install_grub,
-        ]
-      else
-        [
-          :system_network,
-          :system_open_vm_tools,
-          :system_vsphere_cdrom,
-          # Misc
-          :system_parameters,
-          # Finalisation
-          :bosh_clean,
-          :bosh_harden,
-          :bosh_vsphere_agent_settings,
-          :disable_blank_passwords,
-          :bosh_clean_ssh,
-          # Image/bootloader
-          :image_create,
-          :image_install_grub,
-        ]
-      end
+    def vsphere_vcloud_stages
+      [
+        :system_network,
+        :system_open_vm_tools,
+        :disable_blank_passwords,
+        :system_vsphere_cdrom,
+        :system_parameters,
+        :bosh_clean,
+        :bosh_harden,
+        :bosh_enable_password_authentication,
+        :bosh_vsphere_agent_settings,
+        :bosh_clean_ssh,
+        :image_create,
+        :image_install_grub,
+      ]
     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,
-        :disable_blank_passwords,
         :bosh_clean_ssh,
-        # Image/bootloader
         :image_create,
         :image_install_grub,
         :image_aws_update_grub,
@@ -210,17 +137,36 @@ module Bosh::Stemcell
       [
         :system_parameters,
         :base_warden,
-        # Finalisation
         :bosh_clean,
         :bosh_harden,
+        :bosh_enable_password_authentication,
+        :bosh_clean_ssh,
+        :image_create,
+      ]
+    end
+
+    def azure_stages
+      [
+        :system_azure_network,
+        :system_azure_wala,
+        :system_parameters,
+        :bosh_clean,
+        :bosh_harden,
+        :bosh_azure_agent_settings,
         :bosh_clean_ssh,
-        # only used for spec test
         :image_create,
+        :image_install_grub,
+      ]
+    end
+
+    def finish_stemcell_stages
+      [
+        :bosh_package_list
       ]
     end
 
     def centos_os_stages
-     [
+      [
         :base_centos,
         :base_runsvdir,
         :base_centos_packages,
@@ -297,6 +243,7 @@ module Bosh::Stemcell
         :bosh_monit,
         :bosh_ntpdate,
         :bosh_sudoers,
+        :disable_blank_passwords,
       ]
     end
 
@@ -320,6 +267,12 @@ module Bosh::Stemcell
       ]
     end
 
+    def vhd_package_stages
+      [
+        :prepare_vhd_image_stemcell,
+      ]
+    end
+
     def files_package_stages
       [
         :prepare_files_image_stemcell,

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.3130.0'
+    VERSION = '1.3137.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.3130.0
+  version: 1.3137.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3130.0
+        version: 1.3137.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3130.0
+        version: 1.3137.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement