diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-07-15 14:42:22 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-03 09:58:24 +0000 |
| commit | 810b7e460b5fb7e177a3365c837f34df985fb9b1 (patch) | |
| tree | 7de19fbb799e77fd7afc7057e477b3839c13b8ac | |
| parent | 5ce4de6b2b76ca14387e5e5984f3b1067a4a223b (diff) | |
| download | kolla-810b7e460b5fb7e177a3365c837f34df985fb9b1.tar.gz kolla-810b7e460b5fb7e177a3365c837f34df985fb9b1.zip | |
Cleanup images as part of kolla-ansible cleanup
TrivialFix
Change-Id: I88004f08c75e7d648a615e64d59ccf655b6a1a13
| -rw-r--r-- | ansible/roles/cleanup/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/cleanup/tasks/cleanup_images.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/cleanup/tasks/copy_tools.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/cleanup/tasks/main.yml | 2 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 1 |
5 files changed, 18 insertions, 0 deletions
diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml new file mode 100644 index 000000000..6c65e6953 --- /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 000000000..9b03f274c --- /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 737233c8e..192d3bf53 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 d7f8b1e1e..13b59b7fb 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 00a93075d..d3416fb58 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 |