bosh-stemcell 1.3178.0 → 1.3181.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cdef1cd4a674aa9c3523262b556d12cd8b84e76c
4
- data.tar.gz: 63079b30ad7ef50de0735901e08389e729384aa0
3
+ metadata.gz: 966d7479f3b3e3800a16dbfff5c1452d899f2822
4
+ data.tar.gz: ae371fc1340ad70b6e08411c2ab8405b147d05de
5
5
  SHA512:
6
- metadata.gz: 8b05b83818bd6c50aebc2ba46326e7de0b955146f1677ec8b25864fecc7894b2578fad3f492dddc046939bd8b580483b9eff301e9645326e4f76785f08448af5
7
- data.tar.gz: 4eb1323b1d48003e5bc876de7ef3ba28164a9ec2470dea614c2339dad852584149bcb0ca1c56f7f563a6b3b2e3d4207bcdcb88cd1e60fad11eab8a6225f02136
6
+ metadata.gz: 9c772b8ed1a9794848582ffe4171b823f632764ab1b133b17fe4de4f02b20abcbc65c2765e6e77c8e278318b2448c6c8764b361c12ef95fc8bf5a959f29274da
7
+ data.tar.gz: 33a26d66e4d8e7c67c130eea1dfc352a03081104c3433dfbf4cb9d7990543e58b001abd8f6c6cf9196beac3cf5eed41a8c5291a023e8ea9cee6bd8056ddb806b
data/README.md CHANGED
@@ -10,10 +10,9 @@ Note: Use US East (Northern Virginia) region when using AWS in following steps.
10
10
 
11
11
  0. Upload a keypair called "bosh" to AWS that you'll use to connect to the remote vm later
12
12
  0. Create "bosh-stemcell" security group on AWS to allow SSH access to the stemcell (once per AWS account)
13
- 0. Add instructions to set BOSH_AWS_... environment variables
14
13
  0. Install the vagrant plugins we use:
15
14
 
16
- vagrant plugin install vagrant-aws --plugin-version 0.5.0
15
+ vagrant plugin install vagrant-aws
17
16
 
18
17
  ### Bring up the vagrant stemcell building VM
19
18
 
@@ -21,15 +20,9 @@ From a fresh copy of the bosh repo:
21
20
 
22
21
  git submodule update --init --recursive
23
22
 
24
- If you use AWS EC2-Classic environment, run:
25
-
26
- export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
27
- export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
28
- cd bosh-stemcell
29
- vagrant up remote --provider=aws
30
-
31
23
  If you use AWS VPC environment, run:
32
24
 
25
+ export BOSH_VAGRANT_KEY_PATH=PATH-TO-YOUR-SSH-KEY
33
26
  export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
34
27
  export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
35
28
  export BOSH_AWS_SECURITY_GROUP=YOUR-AWS-SECURITY-GROUP-ID
@@ -37,7 +30,7 @@ If you use AWS VPC environment, run:
37
30
  cd bosh-stemcell
38
31
  vagrant up remote --provider=aws
39
32
 
40
- (Note: BOSH\_AWS\_SECURITY\_GROUP should be security group id, instead of name "bosh-stemcell")
33
+ (Note: BOSH\_AWS\_SECURITY\_GROUP should be security group id (e.g. "sg-b799b9dc"), instead of name "bosh-stemcell")
41
34
 
42
35
  ## Updating source code on stemcell building VM
43
36
 
@@ -50,7 +43,7 @@ With existing stemcell building VM run:
50
43
 
51
44
  ## Configure your local ssh and scp to communicate with the stemcell building VM
52
45
 
53
- Once the stemcell builing machine is up, run:
46
+ Once the stemcell-building machine is up, run:
54
47
 
55
48
  vagrant ssh-config remote
56
49
 
@@ -121,7 +114,7 @@ See below [Building the stemcell with local OS image](#building-the-stemcell-wit
121
114
 
122
115
  ### Building the stemcell with published OS image
123
116
 
124
- 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.
117
+ 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.
125
118
 
126
119
  vagrant ssh -c '
127
120
  cd /bosh
@@ -170,6 +170,8 @@ module Bosh::Stemcell
170
170
  ' --tag ~exclude_on_openstack'
171
171
  when 'azure'
172
172
  ' --tag ~exclude_on_azure'
173
+ when 'softlayer'
174
+ ' --tag ~exclude_on_softlayer'
173
175
  else
174
176
  ''
175
177
  end,
@@ -14,6 +14,8 @@ module Bosh::Stemcell
14
14
  Vcloud.new
15
15
  when 'azure'
16
16
  Azure.new
17
+ when 'softlayer'
18
+ Softlayer.new
17
19
  when 'null'
18
20
  NullInfrastructure.new
19
21
  else
@@ -118,5 +120,15 @@ module Bosh::Stemcell
118
120
  {'root_device_name' => '/dev/sda1'}
119
121
  end
120
122
  end
123
+
124
+ class Softlayer < Base
125
+ def initialize
126
+ super(name: 'softlayer', hypervisor: 'esxi', default_disk_size: 3072, disk_formats: ['ovf'])
127
+ end
128
+
129
+ def additional_cloud_properties
130
+ {'root_device_name' => '/dev/sda1'}
131
+ end
132
+ end
121
133
  end
122
134
  end
@@ -53,6 +53,8 @@ module Bosh::Stemcell
53
53
  warden_stages
54
54
  when Infrastructure::Azure then
55
55
  azure_stages
56
+ when Infrastructure::Softlayer then
57
+ softlayer_stages
56
58
  end
57
59
 
58
60
  stages.concat(finish_stemcell_stages)
@@ -159,6 +161,23 @@ module Bosh::Stemcell
159
161
  ]
160
162
  end
161
163
 
164
+ def softlayer_stages
165
+ [
166
+ :system_network,
167
+ :system_softlayer_open_iscsi,
168
+ :system_softlayer_multipath_tools,
169
+ :disable_blank_passwords,
170
+ :system_parameters,
171
+ :bosh_clean,
172
+ :bosh_harden,
173
+ :bosh_enable_password_authentication,
174
+ :bosh_softlayer_agent_settings,
175
+ :bosh_clean_ssh,
176
+ :image_create,
177
+ :image_install_grub,
178
+ ]
179
+ end
180
+
162
181
  def finish_stemcell_stages
163
182
  [
164
183
  :bosh_package_list
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Stemcell
3
- VERSION = '1.3178.0'
3
+ VERSION = '1.3181.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-stemcell
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3178.0
4
+ version: 1.3181.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pivotal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-15 00:00:00.000000000 Z
11
+ date: 2016-01-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_aws_cpi
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3178.0
33
+ version: 1.3181.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3178.0
40
+ version: 1.3181.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: fakefs
43
43
  requirement: !ruby/object:Gem::Requirement