Merge "Clean up after tripleo_persist and tripleo_transfer"

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -265,6 +265,21 @@ outputs:
         - name: Update all packages
           when: step|int == 3
           package: name=* state=latest
+      external_upgrade_tasks:
+        - name: Clean up upgrade artifacts
+          when: step|int == 1
+          tags:
+            - never
+            - system_upgrade_cleanup
+          block:
+            - name: cleanup tripleo_persist
+              include_role:
+                name: tripleo-persist
+                tasks_from: cleanup.yml
+            - name: cleanup tripleo_transfer
+              include_role:
+                name: tripleo-transfer
+                tasks_from: cleanup.yml
       update_tasks:
         - name: Check for existing yum.pid
           stat:  path=/var/run/yum.pid