bosh-stemcell 1.3232.24.0 → 1.3262.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +181 -100
- data/lib/bosh/stemcell/build_environment.rb +2 -1
- data/lib/bosh/stemcell/stage_collection.rb +3 -1
- data/lib/bosh/stemcell/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1eab618e6108bd5db842aadb54e9d9bf93ed9d3c
|
|
4
|
+
data.tar.gz: a9ff028dc14c745ed3233e7952664196642d04d6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 05b845459d339ce1fb924262b0a787dc79b490f7883fe8f086a5441b871b2242204ad9ec1c646dd2fc7efb646fb133c1b2d7125aa2b152f954de7736e0d7dd17
|
|
7
|
+
data.tar.gz: c385d15dcce43efbe75f7c9d926397caf6f256ef9098e9d1a51e0399c4c4a86812dfccedac0f4da960ea6569fb82902b819025320e7e03aa4ae22f677dc14717
|
data/README.md
CHANGED
|
@@ -1,183 +1,264 @@
|
|
|
1
1
|
# bosh-stemcell
|
|
2
2
|
|
|
3
|
-
Tools for creating stemcells
|
|
3
|
+
Tools for creating stemcells.
|
|
4
4
|
|
|
5
|
-
## Choosing execution environment
|
|
6
5
|
|
|
7
|
-
|
|
6
|
+
## Setup
|
|
8
7
|
|
|
9
|
-
|
|
8
|
+
Historically stemcells have been built using an AWS instance created by vagrant. We're in the process of switching that process to use containers. Unless you have a reason for building with vagrant, please use the Container-based method and report any issues.
|
|
10
9
|
|
|
11
|
-
|
|
12
|
-
docker run -it -v $PWD:/bosh -w /bosh -u ubuntu --privileged bosh/os-image-stemcell-builder
|
|
10
|
+
First make sure you have a local copy of this repository. If you already have a stemcell-building environment set up and ready, skip to the **Build Steps** section. Otherwise, follow one of these two methods before trying to run the commands in **Build Steps**.
|
|
13
11
|
|
|
14
|
-
# from within docker container
|
|
15
|
-
bundle install --local
|
|
16
|
-
<STEMCELL_COMMAND>
|
|
17
12
|
|
|
18
|
-
|
|
13
|
+
### Container-based
|
|
19
14
|
|
|
20
|
-
|
|
21
|
-
cd /bosh
|
|
22
|
-
bundle install --local
|
|
23
|
-
<STEMCELL_COMMAND>
|
|
24
|
-
' remote
|
|
15
|
+
The Docker-based environment files are located in `ci/docker/os-image-stemcell-builder`...
|
|
25
16
|
|
|
26
|
-
|
|
17
|
+
host$ cd ci/docker
|
|
27
18
|
|
|
28
|
-
|
|
19
|
+
If you do not already have Docker running, use `vagrant` to start a new VM which has Docker, and then change back into the `./docker` directory...
|
|
20
|
+
|
|
21
|
+
host$ vagrant up
|
|
22
|
+
host$ vagrant ssh
|
|
23
|
+
|
|
24
|
+
Once you have Docker running, run `./run`...
|
|
25
|
+
|
|
26
|
+
vagrant$ /opt/bosh/ci/docker/run os-image-stemcell-builder
|
|
27
|
+
container$ whoami
|
|
28
|
+
ubuntu
|
|
29
|
+
|
|
30
|
+
*You're now ready to continue from the **Build Steps** section.*
|
|
31
|
+
|
|
32
|
+
**Troubleshooting**: if you run into issues, try destroying any existing VM, update your box, and try again...
|
|
33
|
+
|
|
34
|
+
host$ vagrant destroy
|
|
35
|
+
host$ vagrant box update
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
#### Development
|
|
39
|
+
|
|
40
|
+
The Docker image is published to [`bosh/os-image-stemcell-builder`](https://hub.docker.com/r/bosh/os-image-stemcell-builder/).
|
|
41
|
+
|
|
42
|
+
If you need to rebuild the image, first download the ovftool installer from VMWare. Details about this can be found at [my.vmware.com](https://my.vmware.com/group/vmware/details?downloadGroup=OVFTOOL410&productId=489). Specifically...
|
|
43
|
+
|
|
44
|
+
0. Download the `*.bundle` file to the docker image directory (`ci/docker/os-image-stemcell-builder`)
|
|
45
|
+
0. When upgrading versions, update `Dockerfile` with the new file path and SHA
|
|
46
|
+
|
|
47
|
+
Rebuild the container with the `build` script...
|
|
48
|
+
|
|
49
|
+
vagrant$ ./build os-image-stemcell-builder
|
|
50
|
+
|
|
51
|
+
When ready, `push` to DockerHub and use the credentials from LastPass...
|
|
52
|
+
|
|
53
|
+
vagrant$ cd os-image-stemcell-builder
|
|
54
|
+
vagrant$ ./push
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
### AWS-based
|
|
58
|
+
|
|
59
|
+
The AWS_based environment files are located in this directory. The `Vagrantfile` refers to an image in `us-east-1` (*no other region can be used to build images*) and has a few other requirements...
|
|
60
|
+
|
|
61
|
+
0. Upload a keypair called `bosh` to AWS that you'll use to connect to the remote vm later
|
|
62
|
+
0. Create `bosh-stemcell` security group on AWS to allow SSH access to the stemcell (once per AWS account)
|
|
63
|
+
0. Install the vagrant plugins we use:
|
|
64
|
+
|
|
65
|
+
host$ vagrant plugin install vagrant-aws
|
|
66
|
+
|
|
67
|
+
0. Export your AWS security credentials:
|
|
68
|
+
|
|
69
|
+
host$ export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
|
|
70
|
+
host$ export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
|
|
71
|
+
|
|
72
|
+
0. If you use AWS VPC you must also set some additional environment variables:
|
|
73
|
+
|
|
74
|
+
host$ export BOSH_VAGRANT_KEY_PATH=PATH-TO-YOUR-BOSH-SSH-KEY
|
|
75
|
+
host$ export BOSH_AWS_SECURITY_GROUP=YOUR-AWS-SECURITY-GROUP-ID # specify ID (e.g. sg-a1b2c3d4) not the name
|
|
76
|
+
host$ export BOSH_AWS_SUBNET_ID=YOUR-AWS-SUBNET-ID
|
|
77
|
+
|
|
78
|
+
Once you have prepared your environment and configuration, run `vagrant up`...
|
|
79
|
+
|
|
80
|
+
host$ cd bosh-stemcell
|
|
81
|
+
host$ vagrant up remote --provider=aws
|
|
82
|
+
|
|
83
|
+
You can then use `vagrant ssh` to connect...
|
|
84
|
+
|
|
85
|
+
host$ vagrant ssh remote
|
|
86
|
+
|
|
87
|
+
*You're now ready to continue from the **Build Steps** section.*
|
|
88
|
+
|
|
89
|
+
Whenever you make changes to your local `bosh` directory, you'll need to manually sync them to your existing VM...
|
|
90
|
+
|
|
91
|
+
host$ cd bosh-stemcell
|
|
92
|
+
host$ vagrant provision remote
|
|
93
|
+
|
|
94
|
+
Once the stemcell-building machine is up, you can run:
|
|
95
|
+
|
|
96
|
+
host$ vagrant ssh-config remote
|
|
97
|
+
|
|
98
|
+
Then copy the resulting output into your `~/.ssh/config` file.
|
|
99
|
+
|
|
100
|
+
Once this has been done, you can ssh into the stemcell building machine with `ssh remote`
|
|
101
|
+
and you can copy files to and from it using `scp localfile remote:/path/to/destination`
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
## Build Steps
|
|
105
|
+
|
|
106
|
+
At this point, you should be ssh'd and running within your container or AWS instance in the `bosh` directory. Start by installing the latest dependencies before continuing to a specific build task...
|
|
107
|
+
|
|
108
|
+
$ echo $PWD
|
|
109
|
+
/opt/bosh (unless you are running on an AWS instance, then it is /bosh)
|
|
110
|
+
$ bundle install --local
|
|
111
|
+
|
|
112
|
+
|
|
113
|
+
### Build an OS image
|
|
29
114
|
|
|
30
115
|
An OS image is a tarball that contains a snapshot of an entire OS filesystem that contains all the libraries and system utilities that the BOSH agent depends on. It does not contain the BOSH agent or the virtualization tools: there is [a separate Rake task](#building-the-stemcell-with-local-os-image) that adds the BOSH agent and a chosen set of virtualization tools to any base OS image, thereby producing a stemcell.
|
|
31
116
|
|
|
32
|
-
|
|
117
|
+
The OS Image should be rebuilt when you are making changes to which packages we install in the operating system, or when making changes to how we configure those packages, or if you need to pull in and test an updated package from upstream.
|
|
33
118
|
|
|
34
|
-
bundle exec rake stemcell:build_os_image[ubuntu,trusty,$PWD/tmp/ubuntu_base_image.tgz]
|
|
119
|
+
$ bundle exec rake stemcell:build_os_image[ubuntu,trusty,$PWD/tmp/ubuntu_base_image.tgz]
|
|
35
120
|
|
|
36
121
|
The arguments to `stemcell:build_os_image` are:
|
|
37
122
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
123
|
+
0. *`operating_system_name`* identifies which type of OS to fetch. Determines which package repository and packaging tool will be used to download and assemble the files. Must match a value recognized by the [OperatingSystem](lib/bosh/stemcell/operatingsystem.rb) module. Currently, `ubuntu` `centos` and `rhel` are recognized.
|
|
124
|
+
0. *`operating_system_version`* an identifier that the system may use to decide which release of the OS to download. Acceptable values depend on the operating system. For `ubuntu`, use `trusty`. For `centos` or `rhel`, use `7`.
|
|
125
|
+
0. *`os_image_path`* the path to write the finished OS image tarball to. If a file exists at this path already, it will be overwritten without warning.
|
|
41
126
|
|
|
42
|
-
|
|
127
|
+
|
|
128
|
+
#### Special requirements for building a RHEL OS image
|
|
43
129
|
|
|
44
130
|
There are a few extra steps you need to do before building a RHEL OS image:
|
|
45
131
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
132
|
+
0. Start up or re-provision the stemcell building machine (run `vagrant up` or `vagrant provision` from this directory)
|
|
133
|
+
0. Download the [RHEL 7.0 Binary DVD](https://access.redhat.com/downloads/content/69/ver=/rhel---7/7.0/x86_64/product-downloads) image and use `scp` to copy it to the stemcell building machine. Note that RHEL 7.1 does not yet build correctly.
|
|
134
|
+
0. On the stemcell building machine, mount the RHEL 7 DVD at `/mnt/rhel`:
|
|
49
135
|
|
|
50
|
-
|
|
51
|
-
|
|
136
|
+
$ mkdir -p /mnt/rhel
|
|
137
|
+
$ mount rhel-server-7.0-x86_64-dvd.iso /mnt/rhel
|
|
52
138
|
|
|
53
|
-
|
|
139
|
+
0. On the stemcell building machine, put your Red Hat Account username and password into environment variables:
|
|
54
140
|
|
|
55
141
|
$ export RHN_USERNAME=my-rh-username@company.com
|
|
56
142
|
$ export RHN_PASSWORD=my-password
|
|
57
143
|
|
|
58
|
-
|
|
144
|
+
0. On the stemcell building machine, run the stemcell building rake task:
|
|
59
145
|
|
|
60
146
|
$ bundle exec rake stemcell:build_os_image[rhel,7,$PWD/tmp/rhel_7_base_image.tgz]
|
|
61
147
|
|
|
62
148
|
See below [Building the stemcell with local OS image](#building-the-stemcell-with-local-os-image) on how to build stemcell with the new OS image.
|
|
63
149
|
|
|
64
|
-
|
|
150
|
+
|
|
151
|
+
#### Special requirements for building a PhotonOS image
|
|
65
152
|
|
|
66
153
|
There are a few extra steps you need to do before building a PhotonOS image:
|
|
67
154
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
155
|
+
0. Start up or re-provision the stemcell building machine (run `vagrant up` or `vagrant provision` from this directory)
|
|
156
|
+
0. Download the [latest PhotonOS ISO image](https://vmware.bintray.com/photon/iso/) and use `scp` to copy it to the stemcell building machine. The version must be TP2-dev or newer.
|
|
157
|
+
0. On the stemcell building machine, mount the PhotonOS ISO at `/mnt/photonos`:
|
|
71
158
|
|
|
72
|
-
|
|
73
|
-
|
|
159
|
+
$ mkdir -p /mnt/photonos
|
|
160
|
+
$ mount photon.iso /mnt/photonos
|
|
74
161
|
|
|
75
|
-
|
|
162
|
+
0. On the stemcell building machine, run the stemcell building rake task:
|
|
76
163
|
|
|
77
164
|
$ bundle exec rake stemcell:build_os_image[photonos,TP2,$PWD/tmp/photon_TP2_base_image.tgz]
|
|
78
165
|
|
|
79
166
|
See below [Building the stemcell with local OS image](#building-the-stemcell-with-local-os-image) on how to build stemcell with the new OS image.
|
|
80
167
|
|
|
81
|
-
## Building a stemcell
|
|
82
168
|
|
|
83
|
-
### Building
|
|
169
|
+
### Building a stemcell
|
|
170
|
+
|
|
171
|
+
The stemcell should be rebuilt when you are making and testing BOSH-specific changes on top of the base-OS Image such as new bosh-agent versions, or updating security configuration, or changing user settings.
|
|
172
|
+
|
|
173
|
+
*Note:* to speed stemcell building during development, disable the old, bosh-micro-building steps before running `bundle` to avoid the time required to compile the bosh release...
|
|
174
|
+
|
|
175
|
+
$ export BOSH_MICRO_ENABLED=no
|
|
176
|
+
|
|
177
|
+
|
|
178
|
+
#### with published OS image
|
|
179
|
+
|
|
180
|
+
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.
|
|
181
|
+
|
|
182
|
+
$ bundle exec rake stemcell:build[aws,xen,ubuntu,trusty,go,bosh-os-images,bosh-ubuntu-trusty-os-image.tgz]
|
|
84
183
|
|
|
85
|
-
|
|
184
|
+
By default, the stemcell build number will be `0000`. If you need to manually configure it, first run...
|
|
86
185
|
|
|
87
|
-
CANDIDATE_BUILD_NUMBER=<current_build>
|
|
88
|
-
stemcell:build[vsphere,esxi,centos,7,go,bosh-os-images,bosh-centos-7-os-image.tgz]
|
|
186
|
+
$ export CANDIDATE_BUILD_NUMBER=<current_build>
|
|
89
187
|
|
|
90
|
-
### Building the stemcell with local OS image
|
|
91
188
|
|
|
92
|
-
|
|
189
|
+
#### with local OS image
|
|
93
190
|
|
|
191
|
+
If you want to use an OS Image that you just created, use the `stemcell:build_with_local_os_image` task, specifying the OS image tarball.
|
|
94
192
|
|
|
95
|
-
|
|
193
|
+
$ bundle exec rake stemcell:build_with_local_os_image[aws,xen,ubuntu,trusty,go,$PWD/tmp/ubuntu_base_image.tgz]
|
|
194
|
+
|
|
195
|
+
You can also download OS Images from the public S3 bucket. Public OS images can be obtained here:
|
|
96
196
|
|
|
97
197
|
* latest Ubuntu - https://s3.amazonaws.com/bosh-os-images/bosh-ubuntu-trusty-os-image.tgz
|
|
98
|
-
* latest
|
|
198
|
+
* latest CentOS - https://s3.amazonaws.com/bosh-os-images/bosh-centos-7-os-image.tgz
|
|
199
|
+
|
|
200
|
+
*Note*: you may need to append `?versionId=value` to those tarballs. You can find the expected `versionId` by looking at [`os_image_versions.json`](./os_image_versions.json).
|
|
201
|
+
|
|
99
202
|
|
|
100
|
-
|
|
203
|
+
#### Building light stemcell
|
|
101
204
|
|
|
102
|
-
**Warning:** You must use Vagrant on AWS to build light stemcells.
|
|
205
|
+
**Warning:** You must use Vagrant on AWS to build light stemcells for AWS.
|
|
103
206
|
|
|
104
207
|
AWS stemcells can be shipped in light format which includes a reference to a public AMI. This speeds up the process of uploading the stemcell to AWS. To build a light stemcell:
|
|
105
208
|
|
|
106
|
-
export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
|
|
107
|
-
export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
|
|
108
|
-
bundle exec rake stemcell:build_light[$PWD/tmp/bosh-stemcell.tgz,hvm]
|
|
209
|
+
$ export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
|
|
210
|
+
$ export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
|
|
211
|
+
$ bundle exec rake stemcell:build_light[$PWD/tmp/bosh-stemcell.tgz,hvm]
|
|
109
212
|
|
|
110
213
|
To build for specific region specify `BOSH_AWS_REGION` environment variable.
|
|
111
214
|
|
|
112
215
|
NOTE: to build a stemcell for the AWS HVM virtualization type, you must build a light stemcell.
|
|
113
216
|
|
|
114
|
-
|
|
217
|
+
|
|
218
|
+
### Troubleshooting
|
|
115
219
|
|
|
116
220
|
If you find yourself debugging any of the above processes, here is what you need to know:
|
|
117
221
|
|
|
118
|
-
|
|
222
|
+
0. Most of the action happens in Bash scripts, which are referred to as _stages_, and can
|
|
119
223
|
be found in `stemcell_builder/stages/<stage_name>/apply.sh`.
|
|
120
|
-
|
|
224
|
+
0. You should make all changes on your local machine, and sync them over to the AWS stemcell
|
|
121
225
|
building machine using `vagrant provision remote` as explained earlier on this page.
|
|
122
|
-
|
|
226
|
+
0. While debugging a particular stage that is failing, you can resume the process from that
|
|
123
227
|
stage by adding `resume_from=<stage_name>` to the end of your `bundle exec rake` command.
|
|
124
228
|
When a stage's `apply.sh` fails, you should see a message of the form
|
|
125
229
|
`Can't find stage '<stage>' to resume from. Aborting.` so you know which stage failed and
|
|
126
230
|
where you can resume from after fixing the problem.
|
|
127
231
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
```
|
|
131
|
-
bundle exec rake stemcell:build_os_image[ubuntu,trusty,$PWD/tmp/ubuntu_base_image.tgz] resume_from=rsyslog_config
|
|
132
|
-
```
|
|
133
|
-
|
|
134
|
-
## <a name="vagrant-setup"></a>Vagrant Setup
|
|
135
|
-
|
|
136
|
-
**Warning:** You cannot building a stemcell using Vagrant on Virtualbox.
|
|
137
|
-
|
|
138
|
-
### Bring up the vagrant stemcell building VM
|
|
139
|
-
|
|
140
|
-
Note: Use US East (Northern Virginia) region when using AWS in following steps. AMI (Amazon Machine Image) to be used for the stemcell building VM is in the US East (Northern Virginia) region.
|
|
232
|
+
For example:
|
|
141
233
|
|
|
142
|
-
|
|
143
|
-
0. Create "bosh-stemcell" security group on AWS to allow SSH access to the stemcell (once per AWS account)
|
|
144
|
-
0. Install the vagrant plugins we use:
|
|
145
|
-
|
|
146
|
-
vagrant plugin install vagrant-aws
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
From a fresh copy of the bosh repo:
|
|
150
|
-
|
|
151
|
-
git submodule update --init --recursive
|
|
234
|
+
$ bundle exec rake stemcell:build_os_image[ubuntu,trusty,$PWD/tmp/ubuntu_base_image.tgz] resume_from=rsyslog_config
|
|
152
235
|
|
|
153
|
-
|
|
236
|
+
#### How to run tests for OS Images
|
|
237
|
+
The OS tests are meant to be run agains the OS environment to which they belong. When you run the `stemcell:build_os_image` rake task, it will create a .raw OS image that it runs the OS specific tests against. You will need to run the rake task the first time you create your docker container, but everytime after, as long as you do not destroy the container, you should be able to just run the specific tests.
|
|
154
238
|
|
|
155
|
-
|
|
156
|
-
export BOSH_AWS_ACCESS_KEY_ID=YOUR-AWS-ACCESS-KEY
|
|
157
|
-
export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
|
|
158
|
-
export BOSH_AWS_SECURITY_GROUP=YOUR-AWS-SECURITY-GROUP-ID
|
|
159
|
-
export BOSH_AWS_SUBNET_ID=YOUR-AWS-SUBNET-ID
|
|
160
|
-
cd bosh-stemcell
|
|
161
|
-
vagrant up remote --provider=aws
|
|
239
|
+
##### Docker
|
|
162
240
|
|
|
163
|
-
|
|
241
|
+
To run the `centos_7_spec.rb` tests for example you will need to:
|
|
164
242
|
|
|
165
|
-
|
|
243
|
+
* `bundle exec rake stemcell:build_os_image[centos,7,$PWD/tmp/centos_base_image.tgz]`
|
|
244
|
+
* -make changes-
|
|
166
245
|
|
|
167
|
-
|
|
246
|
+
Then run the following:
|
|
168
247
|
|
|
169
|
-
|
|
170
|
-
export BOSH_AWS_SECRET_ACCESS_KEY=YOUR-AWS-SECRET-KEY
|
|
171
|
-
cd bosh-stemcell
|
|
172
|
-
vagrant provision remote
|
|
248
|
+
cd /opt/bosh/bosh-stemcell; OS_IMAGE=/opt/bosh/tmp/centos_base_image.tgz bundle exec rspec -fd spec/os_image/centos_7_spec.rb
|
|
173
249
|
|
|
174
|
-
|
|
250
|
+
##### AWS
|
|
175
251
|
|
|
176
|
-
|
|
252
|
+
In case you are running these on an AWS environment, you will need to:
|
|
253
|
+
* `bundle exec rake stemcell:build_os_image[centos,7,$PWD/tmp/centos_base_image.tgz]`
|
|
254
|
+
* -make changes-
|
|
255
|
+
* `vagrant rsync` in your local machine
|
|
177
256
|
|
|
178
|
-
|
|
257
|
+
Then run the following:
|
|
179
258
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
259
|
+
export STEMCELL_IMAGE=/mnt/stemcells/aws/xen/centos/work/work/aws-xen-centos.raw
|
|
260
|
+
export STEMCELL_WORKDIR=/mnt/stemcells/aws/xen/centos/work/work
|
|
261
|
+
export OS_NAME=centos
|
|
262
|
+
cd bosh-stemcell/
|
|
263
|
+
bundle exec rspec -fd --tag ~exclude_on_aws spec/os_image/centos_7_spec.rb
|
|
264
|
+
|
|
@@ -58,7 +58,8 @@ module Bosh::Stemcell
|
|
|
58
58
|
"spec/stemcells/#{operating_system_spec_name}_spec.rb",
|
|
59
59
|
"spec/stemcells/#{agent.name}_agent_spec.rb",
|
|
60
60
|
"spec/stemcells/#{infrastructure.name}_spec.rb",
|
|
61
|
-
'spec/stemcells/stig_spec.rb'
|
|
61
|
+
'spec/stemcells/stig_spec.rb',
|
|
62
|
+
'spec/stemcells/cis_spec.rb'
|
|
62
63
|
].join(' ')
|
|
63
64
|
end
|
|
64
65
|
|
|
@@ -37,7 +37,7 @@ module Bosh::Stemcell
|
|
|
37
37
|
:aws_cli,
|
|
38
38
|
:logrotate_config,
|
|
39
39
|
:dev_tools_config,
|
|
40
|
-
]
|
|
40
|
+
]
|
|
41
41
|
end
|
|
42
42
|
|
|
43
43
|
def build_stemcell_image_stages
|
|
@@ -264,6 +264,7 @@ module Bosh::Stemcell
|
|
|
264
264
|
:vim_tiny,
|
|
265
265
|
:cron_config,
|
|
266
266
|
:escape_ctrl_alt_del,
|
|
267
|
+
:system_users,
|
|
267
268
|
:bosh_audit
|
|
268
269
|
].flatten.reject{ |s| Bosh::Stemcell::Arch.ppc64le? and s == :system_ixgbevf }
|
|
269
270
|
end
|
|
@@ -284,6 +285,7 @@ module Bosh::Stemcell
|
|
|
284
285
|
def bosh_steps
|
|
285
286
|
[
|
|
286
287
|
:bosh_sysctl,
|
|
288
|
+
:bosh_limits,
|
|
287
289
|
:bosh_users,
|
|
288
290
|
:bosh_monit,
|
|
289
291
|
:bosh_ntpdate,
|
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.
|
|
4
|
+
version: 1.3262.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-
|
|
11
|
+
date: 2016-06-23 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.
|
|
33
|
+
version: 1.3262.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.
|
|
40
|
+
version: 1.3262.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: fakefs
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|