Merge "Cleanup images as part of kolla-ansible cleanup"

ansible/roles/cleanup/defaults/main.yml

+---
+cleanup_include_images: no

ansible/roles/cleanup/tasks/cleanup_images.yml

+---
+- name: Cleaning Kolla images
+  command: /tmp/kolla-cleanup/tools/cleanup-images
+  when:
+    - cleanup_include_images | bool

ansible/roles/cleanup/tasks/copy_tools.yml

@@ -21,3 +21,11 @@
     src: ../tools/cleanup-host
     dest: /tmp/kolla-cleanup/tools
     mode: 0755
+
+- name: Copying cleanup-images file
+  copy:
+    src: ../tools/cleanup-images
+    dest: /tmp/kolla-cleanup/tools
+    mode: 0755
+  when:
+    - cleanup_include_images | bool

ansible/roles/cleanup/tasks/main.yml

@@ -3,4 +3,6 @@
 
 - include: cleanup_containers.yml
 
+- include: cleanup_images.yml
+
 - include: cleanup_host.yml

tools/kolla-ansible

@@ -43,6 +43,7 @@ Commands:
     mariadb_recovery    Recover a completely stopped mariadb cluster
     deploy              Deploy and start all kolla containers
     cleanup             Cleanup containers, volumes and host
+                        ('-e cleanup_include_images=yes' to also remove Kolla images)
     post-deploy         Do post deploy on deploy node
     pull                Pull all images for containers (only pulls, no running container changes)
     reconfigure         Reconfigure OpenStack service