bosh-stemcell 1.3178.0 → 1.3181.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdef1cd4a674aa9c3523262b556d12cd8b84e76c
-  data.tar.gz: 63079b30ad7ef50de0735901e08389e729384aa0
+  metadata.gz: 966d7479f3b3e3800a16dbfff5c1452d899f2822
+  data.tar.gz: ae371fc1340ad70b6e08411c2ab8405b147d05de
 SHA512:
-  metadata.gz: 8b05b83818bd6c50aebc2ba46326e7de0b955146f1677ec8b25864fecc7894b2578fad3f492dddc046939bd8b580483b9eff301e9645326e4f76785f08448af5
-  data.tar.gz: 4eb1323b1d48003e5bc876de7ef3ba28164a9ec2470dea614c2339dad852584149bcb0ca1c56f7f563a6b3b2e3d4207bcdcb88cd1e60fad11eab8a6225f02136
+  metadata.gz: 9c772b8ed1a9794848582ffe4171b823f632764ab1b133b17fe4de4f02b20abcbc65c2765e6e77c8e278318b2448c6c8764b361c12ef95fc8bf5a959f29274da
+  data.tar.gz: 33a26d66e4d8e7c67c130eea1dfc352a03081104c3433dfbf4cb9d7990543e58b001abd8f6c6cf9196beac3cf5eed41a8c5291a023e8ea9cee6bd8056ddb806b

data/README.md

@@ -10,10 +10,9 @@ Note: Use US East (Northern Virginia) region when using AWS in following steps.
 
 0. Upload a keypair called "bosh" to AWS that you'll use to connect to the remote vm later
 0. Create "bosh-stemcell" security group on AWS to allow SSH access to the stemcell (once per AWS account)
-0. Add instructions to set BOSH_AWS_... environment variables
 0. Install the vagrant plugins we use:
 
-        vagrant plugin install vagrant-aws --plugin-version 0.5.0
+        vagrant plugin install vagrant-aws
 
 ### Bring up the vagrant stemcell building VM
 
@@ -21,15 +20,9 @@ From a fresh copy of the bosh repo:
 
     git submodule update --init --recursive
 
-If you use AWS EC2-Classic environment, run:
-
-    export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
-    export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
-    cd bosh-stemcell
-    vagrant up remote --provider=aws
-
 If you use AWS VPC environment, run:
 
+    export BOSH_VAGRANT_KEY_PATH=PATH-TO-YOUR-SSH-KEY
     export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
     export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
     export BOSH_AWS_SECURITY_GROUP=YOUR-AWS-SECURITY-GROUP-ID
@@ -37,7 +30,7 @@ If you use AWS VPC environment, run:
     cd bosh-stemcell
     vagrant up remote --provider=aws
 
-(Note: BOSH\_AWS\_SECURITY\_GROUP should be security group id, instead of name "bosh-stemcell")
+(Note: BOSH\_AWS\_SECURITY\_GROUP should be security group id (e.g. "sg-b799b9dc"), instead of name "bosh-stemcell")
 
 ## Updating source code on stemcell building VM
 
@@ -50,7 +43,7 @@ With existing stemcell building VM run:
 
 ## Configure your local ssh and scp to communicate with the stemcell building VM
 
-Once the stemcell builing machine is up, run:
+Once the stemcell-building machine is up, run:
 
     vagrant ssh-config remote
 
@@ -121,7 +114,7 @@ See below [Building the stemcell with local OS image](#building-the-stemcell-wit
 
 ### Building the stemcell with published OS image
 
-Substitute *\<current_build\>* with the current build number, which can be found by looking at [bosh.io/stemcells](https://bosh.io/stemcells). The final two arguments are the S3 bucket and key for the OS image to use, which can be found by reading the OS\_IMAGES document in this project.
+Substitute *\<current_build\>* with the current build number, which can be found by looking at [bosh.io/stemcells](https://bosh.io/stemcells). Note that the last two arguments to the rake command are the S3 bucket and key of the OS image to use (i.e. in the example below, the .tgz will be downloaded from [http://bosh-os-images.s3.amazonaws.com/bosh-centos-7-os-image.tgz](http://bosh-os-images.s3.amazonaws.com/bosh-centos-7-os-image.tgz)). More info at OS\_IMAGES.
 
     vagrant ssh -c '
       cd /bosh

data/lib/bosh/stemcell/build_environment.rb

@@ -170,6 +170,8 @@ module Bosh::Stemcell
         ' --tag ~exclude_on_openstack'
       when 'azure'
         ' --tag ~exclude_on_azure'
+      when 'softlayer'
+        ' --tag ~exclude_on_softlayer'
       else
         ''
       end,

data/lib/bosh/stemcell/infrastructure.rb

@@ -14,6 +14,8 @@ module Bosh::Stemcell
           Vcloud.new
         when 'azure'
           Azure.new
+        when 'softlayer'
+          Softlayer.new
         when 'null'
           NullInfrastructure.new
         else
@@ -118,5 +120,15 @@ module Bosh::Stemcell
         {'root_device_name' => '/dev/sda1'}
       end
     end
+
+    class Softlayer < Base
+      def initialize
+        super(name: 'softlayer', hypervisor: 'esxi', default_disk_size: 3072, disk_formats: ['ovf'])
+      end
+
+      def additional_cloud_properties
+        {'root_device_name' => '/dev/sda1'}
+      end
+    end
   end
 end

data/lib/bosh/stemcell/stage_collection.rb

@@ -53,6 +53,8 @@ module Bosh::Stemcell
         warden_stages
       when Infrastructure::Azure then
         azure_stages
+      when Infrastructure::Softlayer then
+        softlayer_stages
       end
 
       stages.concat(finish_stemcell_stages)
@@ -159,6 +161,23 @@ module Bosh::Stemcell
       ]
     end
 
+    def softlayer_stages
+      [
+          :system_network,
+          :system_softlayer_open_iscsi,
+          :system_softlayer_multipath_tools,
+          :disable_blank_passwords,
+          :system_parameters,
+          :bosh_clean,
+          :bosh_harden,
+          :bosh_enable_password_authentication,
+          :bosh_softlayer_agent_settings,
+          :bosh_clean_ssh,
+          :image_create,
+          :image_install_grub,
+      ]
+    end
+
     def finish_stemcell_stages
       [
         :bosh_package_list

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.3178.0'
+    VERSION = '1.3181.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.3178.0
+  version: 1.3181.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-19 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.3178.0
+        version: 1.3181.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3178.0
+        version: 1.3181.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement