Skip to content

Commit e877bd7

Browse files
h0nIgh0nIg
committed
feat: move cleanup after hardening, to have more extensibility
1 parent 3b50641 commit e877bd7

2 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎bosh-stemcell/lib/bosh/stemcell/stage_collection.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ def openstack_stages
101101
system_openstack_clock
102102
system_openstack_modules
103103
system_parameters
104-
bosh_clean
105104
bosh_harden
105+
bosh_clean
106106
bosh_openstack_agent_settings
107107
bosh_clean_ssh
108108
restore_apt_sources
@@ -120,8 +120,8 @@ def cloudstack_stages
120120
system_ubuntu_xen_tools
121121
system_parameters
122122
system_vhd_utils_tools
123-
bosh_clean
124123
bosh_harden
124+
bosh_clean
125125
bosh_cloudstack_agent_settings
126126
bosh_clean_ssh
127127
restore_apt_sources
@@ -137,8 +137,8 @@ def vsphere_vcloud_stages
137137
:system_open_vm_tools,
138138
:system_vsphere_cdrom,
139139
:system_parameters,
140-
:bosh_clean,
141140
:bosh_harden,
141+
:bosh_clean,
142142
:bosh_enable_password_authentication,
143143
:bosh_vsphere_agent_settings,
144144
:bosh_clean_ssh,
@@ -157,8 +157,8 @@ def aws_stages
157157
:system_network,
158158
:system_aws_modules,
159159
:system_parameters,
160-
:bosh_clean,
161160
:bosh_harden,
161+
:bosh_clean,
162162
:bosh_aws_agent_settings,
163163
:bosh_clean_ssh,
164164
:udev_aws_rules,
@@ -177,8 +177,8 @@ def alicloud_stages
177177
system_network
178178
system_alicloud
179179
system_parameters
180-
bosh_clean
181180
bosh_harden
181+
bosh_clean
182182
bosh_alicloud_agent_settings
183183
bosh_clean_ssh
184184
restore_apt_sources
@@ -194,8 +194,8 @@ def google_stages
194194
:system_google_modules,
195195
:system_google_packages,
196196
:system_parameters,
197-
:bosh_clean,
198197
:bosh_harden,
198+
:bosh_clean,
199199
:bosh_google_agent_settings,
200200
:bosh_clean_ssh,
201201
:restore_apt_sources,
@@ -212,8 +212,8 @@ def warden_stages
212212
[
213213
:system_parameters,
214214
:base_warden,
215-
:bosh_clean,
216215
:bosh_harden,
216+
:bosh_clean,
217217
:bosh_clean_ssh,
218218
:restore_apt_sources,
219219
# when adding a stage that changes files in the image, do so before
@@ -232,8 +232,8 @@ def azure_stages
232232
:system_parameters,
233233
:enable_udf_module,
234234
:bosh_azure_chrony,
235-
:bosh_clean,
236235
:bosh_harden,
236+
:bosh_clean,
237237
:bosh_azure_agent_settings,
238238
:bosh_clean_ssh,
239239
:restore_apt_sources,
@@ -253,8 +253,8 @@ def softlayer_stages
253253
:system_softlayer_multipath_tools,
254254
:system_softlayer_netplan,
255255
:system_parameters,
256-
:bosh_clean,
257256
:bosh_harden,
257+
:bosh_clean,
258258
:bosh_enable_password_authentication,
259259
:bosh_softlayer_agent_settings,
260260
:bosh_config_root_ssh_login,

‎bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ module Bosh::Stemcell
8787
:system_network,
8888
:system_aws_modules,
8989
:system_parameters,
90-
:bosh_clean,
9190
:bosh_harden,
91+
:bosh_clean,
9292
:bosh_aws_agent_settings,
9393
:bosh_clean_ssh,
9494
:udev_aws_rules,
@@ -120,8 +120,8 @@ module Bosh::Stemcell
120120
:system_network,
121121
:system_alicloud,
122122
:system_parameters,
123-
:bosh_clean,
124123
:bosh_harden,
124+
:bosh_clean,
125125
:bosh_alicloud_agent_settings,
126126
:bosh_clean_ssh,
127127
:restore_apt_sources,
@@ -154,8 +154,8 @@ module Bosh::Stemcell
154154
:system_google_modules,
155155
:system_google_packages,
156156
:system_parameters,
157-
:bosh_clean,
158157
:bosh_harden,
158+
:bosh_clean,
159159
:bosh_google_agent_settings,
160160
:bosh_clean_ssh,
161161
:restore_apt_sources,
@@ -191,8 +191,8 @@ module Bosh::Stemcell
191191
:system_openstack_clock,
192192
:system_openstack_modules,
193193
:system_parameters,
194-
:bosh_clean,
195194
:bosh_harden,
195+
:bosh_clean,
196196
:bosh_openstack_agent_settings,
197197
:bosh_clean_ssh,
198198
:restore_apt_sources,
@@ -223,8 +223,8 @@ module Bosh::Stemcell
223223
:system_ubuntu_xen_tools,
224224
:system_parameters,
225225
:system_vhd_utils_tools,
226-
:bosh_clean,
227226
:bosh_harden,
227+
:bosh_clean,
228228
:bosh_cloudstack_agent_settings,
229229
:bosh_clean_ssh,
230230
:restore_apt_sources,
@@ -253,8 +253,8 @@ module Bosh::Stemcell
253253
:system_open_vm_tools,
254254
:system_vsphere_cdrom,
255255
:system_parameters,
256-
:bosh_clean,
257256
:bosh_harden,
257+
:bosh_clean,
258258
:bosh_enable_password_authentication,
259259
:bosh_vsphere_agent_settings,
260260
:bosh_clean_ssh,
@@ -282,8 +282,8 @@ module Bosh::Stemcell
282282
:system_open_vm_tools,
283283
:system_vsphere_cdrom,
284284
:system_parameters,
285-
:bosh_clean,
286285
:bosh_harden,
286+
:bosh_clean,
287287
:bosh_enable_password_authentication,
288288
:bosh_vsphere_agent_settings,
289289
:bosh_clean_ssh,
@@ -309,8 +309,8 @@ module Bosh::Stemcell
309309
:system_parameters,
310310
:enable_udf_module,
311311
:bosh_azure_chrony,
312-
:bosh_clean,
313312
:bosh_harden,
313+
:bosh_clean,
314314
:bosh_azure_agent_settings,
315315
:bosh_clean_ssh,
316316
:restore_apt_sources,
@@ -348,8 +348,8 @@ module Bosh::Stemcell
348348
:system_softlayer_multipath_tools,
349349
:system_softlayer_netplan,
350350
:system_parameters,
351-
:bosh_clean,
352351
:bosh_harden,
352+
:bosh_clean,
353353
:bosh_enable_password_authentication,
354354
:bosh_softlayer_agent_settings,
355355
:bosh_config_root_ssh_login,
@@ -371,8 +371,8 @@ module Bosh::Stemcell
371371
[
372372
:system_parameters,
373373
:base_warden,
374-
:bosh_clean,
375374
:bosh_harden,
375+
:bosh_clean,
376376
:bosh_clean_ssh,
377377
:restore_apt_sources,
378378
:image_create,

0 commit comments

Comments
 (0)