Fix #204, user_modification phase has been introduced

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,

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):

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

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):

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