From 810b7e460b5fb7e177a3365c837f34df985fb9b1 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Fri, 15 Jul 2016 14:42:22 +0100
Subject: [PATCH] Cleanup images as part of kolla-ansible cleanup
TrivialFix
Change-Id: I88004f08c75e7d648a615e64d59ccf655b6a1a13
---
ansible/roles/cleanup/defaults/main.yml | 2 ++
ansible/roles/cleanup/tasks/cleanup_images.yml | 5 +++++
ansible/roles/cleanup/tasks/copy_tools.yml | 8 ++++++++
ansible/roles/cleanup/tasks/main.yml | 2 ++
tools/kolla-ansible | 1 +
5 files changed, 18 insertions(+)
create mode 100644 ansible/roles/cleanup/defaults/main.yml
create mode 100644 ansible/roles/cleanup/tasks/cleanup_images.yml
diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml
new file mode 100644
index 0000000000..6c65e69530
--- /dev/null
+++ b/ansible/roles/cleanup/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+cleanup_include_images: no
diff --git a/ansible/roles/cleanup/tasks/cleanup_images.yml b/ansible/roles/cleanup/tasks/cleanup_images.yml
new file mode 100644
index 0000000000..9b03f274c0
--- /dev/null
+++ b/ansible/roles/cleanup/tasks/cleanup_images.yml
@@ -0,0 +1,5 @@
+---
+- name: Cleaning Kolla images
+ command: /tmp/kolla-cleanup/tools/cleanup-images
+ when:
+ - cleanup_include_images | bool
diff --git a/ansible/roles/cleanup/tasks/copy_tools.yml b/ansible/roles/cleanup/tasks/copy_tools.yml
index 737233c8e7..192d3bf537 100644
--- a/ansible/roles/cleanup/tasks/copy_tools.yml
+++ b/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
diff --git a/ansible/roles/cleanup/tasks/main.yml b/ansible/roles/cleanup/tasks/main.yml
index d7f8b1e1e2..13b59b7fbf 100644
--- a/ansible/roles/cleanup/tasks/main.yml
+++ b/ansible/roles/cleanup/tasks/main.yml
@@ -3,4 +3,6 @@
- include: cleanup_containers.yml
+- include: cleanup_images.yml
+
- include: cleanup_host.yml
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 00a93075d6..d3416fb587 100755
--- a/tools/kolla-ansible
+++ b/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
--
GitLab