diff --git a/bootstrapvz/common/phases.py b/bootstrapvz/common/phases.py index e83feab..99f39a7 100644 --- a/bootstrapvz/common/phases.py +++ b/bootstrapvz/common/phases.py @@ -7,6 +7,7 @@ volume_mounting = Phase('Volume mounting', 'Mounting bootstrap volume') os_installation = Phase('OS installation', 'Installing the operating system') package_installation = Phase('Package installation', 'Installing software') system_modification = Phase('System modification', 'Modifying configuration files, adding resources, etc.') +user_modification = Phase('User modification', 'Running user specified modifications') system_cleaning = Phase('System cleaning', 'Removing sensitive data, temporary files and other leftovers') volume_unmounting = Phase('Volume unmounting', 'Unmounting the bootstrap volume') image_registration = Phase('Image registration', 'Uploading/Registering with the provider') @@ -19,6 +20,7 @@ order = [preparation, os_installation, package_installation, system_modification, + user_modification, system_cleaning, volume_unmounting, image_registration, diff --git a/bootstrapvz/plugins/ansible/tasks.py b/bootstrapvz/plugins/ansible/tasks.py index 100e69d..4dd675d 100644 --- a/bootstrapvz/plugins/ansible/tasks.py +++ b/bootstrapvz/plugins/ansible/tasks.py @@ -30,7 +30,7 @@ class AddPackages(Task): class RunAnsiblePlaybook(Task): description = 'Running ansible playbooks' - phase = phases.system_modification + phase = phases.user_modification @classmethod def run(cls, info): diff --git a/bootstrapvz/plugins/file_copy/tasks.py b/bootstrapvz/plugins/file_copy/tasks.py index 06c5dd8..90e1f08 100644 --- a/bootstrapvz/plugins/file_copy/tasks.py +++ b/bootstrapvz/plugins/file_copy/tasks.py @@ -37,8 +37,8 @@ def modify_path(info, path, entry): class MkdirCommand(Task): - description = 'copy files into the image' - phase = phases.system_modification + description = 'Creating directories requested by user' + phase = phases.user_modification @classmethod def run(cls, info): @@ -51,8 +51,8 @@ class MkdirCommand(Task): class FileCopyCommand(Task): - description = 'copy files into the image' - phase = phases.system_modification + description = 'Copying user specified files into the image' + phase = phases.user_modification predecessors = [MkdirCommand] @classmethod diff --git a/bootstrapvz/plugins/image_commands/tasks.py b/bootstrapvz/plugins/image_commands/tasks.py index 2ea50e9..5ab2b27 100644 --- a/bootstrapvz/plugins/image_commands/tasks.py +++ b/bootstrapvz/plugins/image_commands/tasks.py @@ -3,8 +3,8 @@ from bootstrapvz.common import phases class ImageExecuteCommand(Task): - description = 'Execute command in the image' - phase = phases.system_modification + description = 'Executing commands in the image' + phase = phases.user_modification @classmethod def run(cls, info): diff --git a/bootstrapvz/plugins/puppet/tasks.py b/bootstrapvz/plugins/puppet/tasks.py index 05df26f..1efac12 100644 --- a/bootstrapvz/plugins/puppet/tasks.py +++ b/bootstrapvz/plugins/puppet/tasks.py @@ -57,7 +57,7 @@ class CopyPuppetAssets(Task): class ApplyPuppetManifest(Task): description = 'Applying puppet manifest' - phase = phases.system_modification + phase = phases.user_modification predecessors = [CopyPuppetAssets] @classmethod