bosh-stemcell 1.2915.0 → 1.2922.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/stemcell/stage_collection.rb +116 -101
  3. data/lib/bosh/stemcell/version.rb +1 -1
  4. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 48b9f47832ea080701b97cf20d67d85fbb9e9f91
4
- data.tar.gz: bff1a1d1470d3426f74e1ea8c7fbc8e4a3f56975
3
+ metadata.gz: e63abd8e3e4094e14eb2055f037830ebf0fdfb8b
4
+ data.tar.gz: 4adef86bd8f5af990a1bd68f19a487e22f89c99a
5
5
  SHA512:
6
- metadata.gz: 292d8754ef6acd4af6ca939bfc1ec7a9bdf767de28d41a555f0ceba80961cc6799db3aa8820c5a989ff0c71e84564547393afc9714856d0d396dfa5cf130a05b
7
- data.tar.gz: 473de17cebc3663ec16555b43dae124fb9bbf2774f0a48fc90ce5fee8f8a434faa90555b3d0b3dea4b0b4ce522eb022606088217ce6c4589f44d375ddf003cd5
6
+ metadata.gz: 883740b6c50493eb018fad4ec6cf2c3012c46aff7d5e4c0aad8f4e7dd9ca645a8715bac54c254e0eae4f654cd7e214abd0e1de59951f720feec68ca194a25087
7
+ data.tar.gz: 317890a2a52246297e56c4b87d1b5cd7800e7dfd58d652d295727be725822acf4ba7b0283187635119c9ce51b2655dd2553cd46bf390f3c1d42c34398aa3b657
data/lib/bosh/stemcell/stage_collection.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'bosh/stemcell/definition'
2
2
  require 'forwardable'
3
3
 
4
+ # rubocop:disable MethodLength
4
5
  module Bosh::Stemcell
5
6
  class StageCollection
6
7
  extend Forwardable
@@ -69,29 +70,128 @@ module Bosh::Stemcell
69
70
  def_delegators :@definition, :infrastructure, :operating_system, :agent
70
71
 
71
72
  def openstack_stages
72
- if operating_system.instance_of?(OperatingSystem::Centos) || operating_system.instance_of?(OperatingSystem::Rhel)
73
- centos_openstack_stages
73
+ if is_centos? || is_rhel?
74
+ [
75
+ :system_network,
76
+ # Misc
77
+ :system_parameters,
78
+ # Finalisation,
79
+ :bosh_clean,
80
+ :bosh_harden,
81
+ :bosh_disable_password_authentication,
82
+ :bosh_openstack_agent_settings,
83
+ :image_create,
84
+ :image_install_grub,
85
+ ]
74
86
  else
75
- ubuntu_openstack_stages
87
+ [
88
+ :system_network,
89
+ # Misc
90
+ :system_openstack_clock,
91
+ :system_openstack_modules,
92
+ :system_parameters,
93
+ # Finalisation,
94
+ :bosh_clean,
95
+ :bosh_harden,
96
+ :bosh_disable_password_authentication,
97
+ :bosh_openstack_agent_settings,
98
+ # Image/bootloader
99
+ :image_create,
100
+ :image_install_grub,
101
+ ]
76
102
  end
77
103
  end
78
104
 
79
105
  def vsphere_stages
80
- if operating_system.instance_of?(OperatingSystem::Centos)
81
- centos_vmware_stages
106
+ if is_centos?
107
+ [
108
+ :system_network,
109
+ :system_vsphere_cdrom,
110
+ :system_parameters,
111
+ :bosh_clean,
112
+ :bosh_harden,
113
+ :bosh_vsphere_agent_settings,
114
+ :image_create,
115
+ :image_install_grub,
116
+ ]
82
117
  else
83
- ubuntu_vmware_stages
118
+ [
119
+ :system_network,
120
+ :system_open_vm_tools,
121
+ :system_vsphere_cdrom,
122
+ # Misc
123
+ :system_parameters,
124
+ # Finalisation
125
+ :bosh_clean,
126
+ :bosh_harden,
127
+ :bosh_vsphere_agent_settings,
128
+ # Image/bootloader
129
+ :image_create,
130
+ :image_install_grub,
131
+ ]
84
132
  end
85
133
  end
86
134
 
87
135
  def vcloud_stages
88
- if operating_system.instance_of?(OperatingSystem::Centos)
89
- centos_vmware_stages
136
+ if is_centos?
137
+ [
138
+ :system_network,
139
+ :system_vsphere_cdrom,
140
+ :system_parameters,
141
+ :bosh_clean,
142
+ :bosh_harden,
143
+ :bosh_vsphere_agent_settings,
144
+ :image_create,
145
+ :image_install_grub,
146
+ ]
90
147
  else
91
- ubuntu_vmware_stages
148
+ [
149
+ :system_network,
150
+ :system_open_vm_tools,
151
+ :system_vsphere_cdrom,
152
+ # Misc
153
+ :system_parameters,
154
+ # Finalisation
155
+ :bosh_clean,
156
+ :bosh_harden,
157
+ :bosh_vsphere_agent_settings,
158
+ # Image/bootloader
159
+ :image_create,
160
+ :image_install_grub,
161
+ ]
92
162
  end
93
163
  end
94
164
 
165
+ def aws_stages
166
+ [
167
+ # Misc
168
+ :system_network,
169
+ :system_aws_modules,
170
+ :system_parameters,
171
+ # Finalisation
172
+ :bosh_clean,
173
+ :bosh_harden,
174
+ :bosh_disable_password_authentication,
175
+ :bosh_aws_agent_settings,
176
+ # Image/bootloader
177
+ :image_create,
178
+ :image_install_grub,
179
+ :image_aws_update_grub,
180
+ ]
181
+ end
182
+
183
+ def warden_stages
184
+ [
185
+ :system_parameters,
186
+ :base_warden,
187
+ # Finalisation
188
+ :bosh_clean,
189
+ :bosh_harden,
190
+ # only used for spec test
191
+ :image_create,
192
+ ]
193
+ end
194
+
95
195
  def centos_os_stages
96
196
  os_stages = [
97
197
  :base_centos,
@@ -153,98 +253,6 @@ module Bosh::Stemcell
153
253
  ]
154
254
  end
155
255
 
156
- def centos_vmware_stages
157
- [
158
- #:system_open_vm_tools,
159
- :system_vsphere_cdrom,
160
- :system_parameters,
161
- :bosh_clean,
162
- :bosh_harden,
163
- :bosh_vsphere_agent_settings,
164
- :image_create,
165
- :image_install_grub,
166
- ]
167
- end
168
-
169
- def centos_openstack_stages
170
- [
171
- # Misc
172
- :system_openstack_network_centos,
173
- :system_parameters,
174
- # Finalisation,
175
- :bosh_clean,
176
- :bosh_harden,
177
- :bosh_disable_password_authentication,
178
- :bosh_openstack_agent_settings,
179
- :image_create,
180
- :image_install_grub,
181
- ]
182
- end
183
-
184
- def aws_stages
185
- [
186
- # Misc
187
- :system_aws_network,
188
- :system_aws_modules,
189
- :system_parameters,
190
- # Finalisation
191
- :bosh_clean,
192
- :bosh_harden,
193
- :bosh_disable_password_authentication,
194
- :bosh_aws_agent_settings,
195
- # Image/bootloader
196
- :image_create,
197
- :image_install_grub,
198
- :image_aws_update_grub,
199
- ]
200
- end
201
-
202
- def ubuntu_openstack_stages
203
- [
204
- # Misc
205
- :system_openstack_network,
206
- :system_openstack_clock,
207
- :system_openstack_modules,
208
- :system_parameters,
209
- # Finalisation,
210
- :bosh_clean,
211
- :bosh_harden,
212
- :bosh_disable_password_authentication,
213
- :bosh_openstack_agent_settings,
214
- # Image/bootloader
215
- :image_create,
216
- :image_install_grub,
217
- ]
218
- end
219
-
220
- def ubuntu_vmware_stages
221
- [
222
- :system_open_vm_tools,
223
- :system_vsphere_cdrom,
224
- # Misc
225
- :system_parameters,
226
- # Finalisation
227
- :bosh_clean,
228
- :bosh_harden,
229
- :bosh_vsphere_agent_settings,
230
- # Image/bootloader
231
- :image_create,
232
- :image_install_grub,
233
- ]
234
- end
235
-
236
- def warden_stages
237
- [
238
- :system_parameters,
239
- :base_warden,
240
- # Finalisation
241
- :bosh_clean,
242
- :bosh_harden,
243
- # only used for spec test
244
- :image_create,
245
- ]
246
- end
247
-
248
256
  def raw_package_stages
249
257
  [
250
258
  :prepare_raw_image_stemcell,
@@ -271,5 +279,12 @@ module Bosh::Stemcell
271
279
  ]
272
280
  end
273
281
 
282
+ def is_centos?
283
+ operating_system.instance_of?(OperatingSystem::Centos)
284
+ end
285
+
286
+ def is_rhel?
287
+ operating_system.instance_of?(OperatingSystem::Rhel)
288
+ end
274
289
  end
275
290
  end
data/lib/bosh/stemcell/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Stemcell
3
- VERSION = '1.2915.0'
3
+ VERSION = '1.2922.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.2915.0
4
+ version: 1.2922.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pivotal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-07 00:00:00.000000000 Z
11
+ date: 2015-04-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_aws_cpi
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.2915.0
19
+ version: 1.2922.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.2915.0
26
+ version: 1.2922.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh-core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2915.0
33
+ version: 1.2922.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.2915.0
40
+ version: 1.2922.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: fakefs
43
43
  requirement: !ruby/object:Gem::Requirement