From 6d45786d5992a62af08ee4bed31094b6834daf41 Mon Sep 17 00:00:00 2001 From: Duane DeCapite Date: Fri, 5 Aug 2016 14:01:38 -0400 Subject: [PATCH] Change cleanup to destroy as cleanup is a misnomer The cleanup command in the external API is a misnomer and should be called destroy. Change-Id: I083e80699e09bb24266ce1bf549772a5de92a49e Closes-Bug: 1610364 --- ansible/{cleanup.yml => destroy.yml} | 2 +- ansible/roles/cleanup/defaults/main.yml | 2 -- ansible/roles/cleanup/tasks/cleanup_images.yml | 5 ----- ansible/roles/destroy/defaults/main.yml | 2 ++ .../{cleanup => destroy}/tasks/cleanup_containers.yml | 2 +- .../roles/{cleanup => destroy}/tasks/cleanup_host.yml | 4 ++-- ansible/roles/destroy/tasks/cleanup_images.yml | 5 +++++ .../roles/{cleanup => destroy}/tasks/copy_tools.yml | 2 +- ansible/roles/{cleanup => destroy}/tasks/main.yml | 0 tools/kolla-ansible | 10 +++++----- 10 files changed, 17 insertions(+), 17 deletions(-) rename ansible/{cleanup.yml => destroy.yml} (65%) delete mode 100644 ansible/roles/cleanup/defaults/main.yml delete mode 100644 ansible/roles/cleanup/tasks/cleanup_images.yml create mode 100644 ansible/roles/destroy/defaults/main.yml rename ansible/roles/{cleanup => destroy}/tasks/cleanup_containers.yml (53%) rename ansible/roles/{cleanup => destroy}/tasks/cleanup_host.yml (56%) create mode 100644 ansible/roles/destroy/tasks/cleanup_images.yml rename ansible/roles/{cleanup => destroy}/tasks/copy_tools.yml (94%) rename ansible/roles/{cleanup => destroy}/tasks/main.yml (100%) diff --git a/ansible/cleanup.yml b/ansible/destroy.yml similarity index 65% rename from ansible/cleanup.yml rename to ansible/destroy.yml index 14d5668cfb..73b0870727 100644 --- a/ansible/cleanup.yml +++ b/ansible/destroy.yml @@ -1,4 +1,4 @@ --- - hosts: all roles: - - cleanup + - destroy diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml deleted file mode 100644 index 6c65e69530..0000000000 --- a/ansible/roles/cleanup/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -cleanup_include_images: no diff --git a/ansible/roles/cleanup/tasks/cleanup_images.yml b/ansible/roles/cleanup/tasks/cleanup_images.yml deleted file mode 100644 index 9b03f274c0..0000000000 --- a/ansible/roles/cleanup/tasks/cleanup_images.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Cleaning Kolla images - command: /tmp/kolla-cleanup/tools/cleanup-images - when: - - cleanup_include_images | bool diff --git a/ansible/roles/destroy/defaults/main.yml b/ansible/roles/destroy/defaults/main.yml new file mode 100644 index 0000000000..0d75e357de --- /dev/null +++ b/ansible/roles/destroy/defaults/main.yml @@ -0,0 +1,2 @@ +--- +destroy_include_images: no diff --git a/ansible/roles/cleanup/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml similarity index 53% rename from ansible/roles/cleanup/tasks/cleanup_containers.yml rename to ansible/roles/destroy/tasks/cleanup_containers.yml index 1de1522678..4ccdd9cdd8 100644 --- a/ansible/roles/cleanup/tasks/cleanup_containers.yml +++ b/ansible/roles/destroy/tasks/cleanup_containers.yml @@ -1,3 +1,3 @@ --- -- name: Cleaning all containers and volumes +- name: Destroying all Kolla containers and volumes command: /tmp/kolla-cleanup/tools/cleanup-containers diff --git a/ansible/roles/cleanup/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml similarity index 56% rename from ansible/roles/cleanup/tasks/cleanup_host.yml rename to ansible/roles/destroy/tasks/cleanup_host.yml index 266ce1752e..9429eba6b1 100644 --- a/ansible/roles/cleanup/tasks/cleanup_host.yml +++ b/ansible/roles/destroy/tasks/cleanup_host.yml @@ -1,8 +1,8 @@ --- -- name: Cleaning host +- name: Destroying Kolla host configuration command: /tmp/kolla-cleanup/tools/cleanup-host -- name: Removing kolla-cleanup folder +- name: Destroying kolla-cleanup folder file: path: /tmp/kolla-cleanup state: absent diff --git a/ansible/roles/destroy/tasks/cleanup_images.yml b/ansible/roles/destroy/tasks/cleanup_images.yml new file mode 100644 index 0000000000..e6b8d6073a --- /dev/null +++ b/ansible/roles/destroy/tasks/cleanup_images.yml @@ -0,0 +1,5 @@ +--- +- name: Destroying Kolla images + command: /tmp/kolla-cleanup/tools/cleanup-images + when: + - destroy_include_images | bool diff --git a/ansible/roles/cleanup/tasks/copy_tools.yml b/ansible/roles/destroy/tasks/copy_tools.yml similarity index 94% rename from ansible/roles/cleanup/tasks/copy_tools.yml rename to ansible/roles/destroy/tasks/copy_tools.yml index 192d3bf537..6a990e197c 100644 --- a/ansible/roles/cleanup/tasks/copy_tools.yml +++ b/ansible/roles/destroy/tasks/copy_tools.yml @@ -28,4 +28,4 @@ dest: /tmp/kolla-cleanup/tools mode: 0755 when: - - cleanup_include_images | bool + - destroy_include_images | bool diff --git a/ansible/roles/cleanup/tasks/main.yml b/ansible/roles/destroy/tasks/main.yml similarity index 100% rename from ansible/roles/cleanup/tasks/main.yml rename to ansible/roles/destroy/tasks/main.yml diff --git a/tools/kolla-ansible b/tools/kolla-ansible index d3416fb587..030f0323e6 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -42,8 +42,8 @@ Commands: prechecks Do pre-deployment checks for hosts 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) + destroy Destroy Kolla containers, volumes and host configuration + ('-e destroy_include_images=yes' to also destroy 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 @@ -140,9 +140,9 @@ case "$1" in EXTRA_OPTS="$EXTRA_OPTS -e action=deploy" PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml" ;; -(cleanup) - ACTION="Cleanup containers, volumes and host" - PLAYBOOK="${BASEDIR}/ansible/cleanup.yml" +(destroy) + ACTION="Destroy Kolla containers, volumes and host configuration" + PLAYBOOK="${BASEDIR}/ansible/destroy.yml" ;; (deploy) ACTION="Deploying Playbooks"