Skip to content

feat: move cleanup after hardening, to have more extensibility #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
h0nIg wants to merge 1 commit into
base: ubuntu-jammy
Choose a base branch
from
+19 −19
Draft

feat: move cleanup after hardening, to have more extensibility #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bosh-stemcell/lib/bosh/stemcell/stage_collection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def openstack_stages
system_openstack_clock
system_openstack_modules
system_parameters
bosh_clean
bosh_harden
bosh_clean
bosh_openstack_agent_settings
bosh_clean_ssh
restore_apt_sources
Expand All @@ -120,8 +120,8 @@ def cloudstack_stages
system_ubuntu_xen_tools
system_parameters
system_vhd_utils_tools
bosh_clean
bosh_harden
bosh_clean
bosh_cloudstack_agent_settings
bosh_clean_ssh
restore_apt_sources
Expand All @@ -137,8 +137,8 @@ def vsphere_vcloud_stages
:system_open_vm_tools,
:system_vsphere_cdrom,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_enable_password_authentication,
:bosh_vsphere_agent_settings,
:bosh_clean_ssh,
Expand All @@ -157,8 +157,8 @@ def aws_stages
:system_network,
:system_aws_modules,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
:bosh_aws_agent_settings,
:bosh_clean_ssh,
:udev_aws_rules,
Expand All @@ -177,8 +177,8 @@ def alicloud_stages
system_network
system_alicloud
system_parameters
bosh_clean
bosh_harden
bosh_clean
bosh_alicloud_agent_settings
bosh_clean_ssh
restore_apt_sources
Expand All @@ -194,8 +194,8 @@ def google_stages
:system_google_modules,
:system_google_packages,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_google_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand All @@ -212,8 +212,8 @@ def warden_stages
[
:system_parameters,
:base_warden,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_clean_ssh,
:restore_apt_sources,
# when adding a stage that changes files in the image, do so before
Expand All @@ -232,8 +232,8 @@ def azure_stages
:system_parameters,
:enable_udf_module,
:bosh_azure_chrony,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_azure_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand All @@ -253,8 +253,8 @@ def softlayer_stages
:system_softlayer_multipath_tools,
:system_softlayer_netplan,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_enable_password_authentication,
:bosh_softlayer_agent_settings,
:bosh_config_root_ssh_login,
Expand Down
20 changes: 10 additions & 10 deletions bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ module Bosh::Stemcell
:system_network,
:system_aws_modules,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_aws_agent_settings,
:bosh_clean_ssh,
:udev_aws_rules,
Expand Down Expand Up @@ -120,8 +120,8 @@ module Bosh::Stemcell
:system_network,
:system_alicloud,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_alicloud_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand Down Expand Up @@ -154,8 +154,8 @@ module Bosh::Stemcell
:system_google_modules,
:system_google_packages,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_google_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand Down Expand Up @@ -191,8 +191,8 @@ module Bosh::Stemcell
:system_openstack_clock,
:system_openstack_modules,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_openstack_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand Down Expand Up @@ -223,8 +223,8 @@ module Bosh::Stemcell
:system_ubuntu_xen_tools,
:system_parameters,
:system_vhd_utils_tools,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_cloudstack_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand Down Expand Up @@ -253,8 +253,8 @@ module Bosh::Stemcell
:system_open_vm_tools,
:system_vsphere_cdrom,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_enable_password_authentication,
:bosh_vsphere_agent_settings,
:bosh_clean_ssh,
Expand Down Expand Up @@ -282,8 +282,8 @@ module Bosh::Stemcell
:system_open_vm_tools,
:system_vsphere_cdrom,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_enable_password_authentication,
:bosh_vsphere_agent_settings,
:bosh_clean_ssh,
Expand All @@ -309,8 +309,8 @@ module Bosh::Stemcell
:system_parameters,
:enable_udf_module,
:bosh_azure_chrony,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_azure_agent_settings,
:bosh_clean_ssh,
:restore_apt_sources,
Expand Down Expand Up @@ -348,8 +348,8 @@ module Bosh::Stemcell
:system_softlayer_multipath_tools,
:system_softlayer_netplan,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_enable_password_authentication,
:bosh_softlayer_agent_settings,
:bosh_config_root_ssh_login,
Expand All @@ -371,8 +371,8 @@ module Bosh::Stemcell
[
:system_parameters,
:base_warden,
:bosh_clean,
:bosh_harden,
:bosh_clean,
:bosh_clean_ssh,
:restore_apt_sources,
:image_create,
Expand Down
Loading