From 6d45786d5992a62af08ee4bed31094b6834daf41 Mon Sep 17 00:00:00 2001 From: Duane DeCapite Date: Fri, 5 Aug 2016 14:01:38 -0400 Subject: 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 | 4 --- ansible/destroy.yml | 4 +++ ansible/roles/cleanup/defaults/main.yml | 2 -- ansible/roles/cleanup/tasks/cleanup_containers.yml | 3 --- ansible/roles/cleanup/tasks/cleanup_host.yml | 8 ------ ansible/roles/cleanup/tasks/cleanup_images.yml | 5 ---- ansible/roles/cleanup/tasks/copy_tools.yml | 31 ---------------------- ansible/roles/cleanup/tasks/main.yml | 8 ------ ansible/roles/destroy/defaults/main.yml | 2 ++ ansible/roles/destroy/tasks/cleanup_containers.yml | 3 +++ ansible/roles/destroy/tasks/cleanup_host.yml | 8 ++++++ ansible/roles/destroy/tasks/cleanup_images.yml | 5 ++++ ansible/roles/destroy/tasks/copy_tools.yml | 31 ++++++++++++++++++++++ ansible/roles/destroy/tasks/main.yml | 8 ++++++ tools/kolla-ansible | 10 +++---- 15 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 ansible/cleanup.yml create mode 100644 ansible/destroy.yml delete mode 100644 ansible/roles/cleanup/defaults/main.yml delete mode 100644 ansible/roles/cleanup/tasks/cleanup_containers.yml delete mode 100644 ansible/roles/cleanup/tasks/cleanup_host.yml delete mode 100644 ansible/roles/cleanup/tasks/cleanup_images.yml delete mode 100644 ansible/roles/cleanup/tasks/copy_tools.yml delete mode 100644 ansible/roles/cleanup/tasks/main.yml create mode 100644 ansible/roles/destroy/defaults/main.yml create mode 100644 ansible/roles/destroy/tasks/cleanup_containers.yml create mode 100644 ansible/roles/destroy/tasks/cleanup_host.yml create mode 100644 ansible/roles/destroy/tasks/cleanup_images.yml create mode 100644 ansible/roles/destroy/tasks/copy_tools.yml create mode 100644 ansible/roles/destroy/tasks/main.yml diff --git a/ansible/cleanup.yml b/ansible/cleanup.yml deleted file mode 100644 index 14d5668cf..000000000 --- a/ansible/cleanup.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: all - roles: - - cleanup diff --git a/ansible/destroy.yml b/ansible/destroy.yml new file mode 100644 index 000000000..73b087072 --- /dev/null +++ b/ansible/destroy.yml @@ -0,0 +1,4 @@ +--- +- hosts: all + roles: + - destroy diff --git a/ansible/roles/cleanup/defaults/main.yml b/ansible/roles/cleanup/defaults/main.yml deleted file mode 100644 index 6c65e6953..000000000 --- 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_containers.yml b/ansible/roles/cleanup/tasks/cleanup_containers.yml deleted file mode 100644 index 1de152267..000000000 --- a/ansible/roles/cleanup/tasks/cleanup_containers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Cleaning all containers and volumes - command: /tmp/kolla-cleanup/tools/cleanup-containers diff --git a/ansible/roles/cleanup/tasks/cleanup_host.yml b/ansible/roles/cleanup/tasks/cleanup_host.yml deleted file mode 100644 index 266ce1752..000000000 --- a/ansible/roles/cleanup/tasks/cleanup_host.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Cleaning host - command: /tmp/kolla-cleanup/tools/cleanup-host - -- name: Removing kolla-cleanup folder - file: - path: /tmp/kolla-cleanup - state: absent diff --git a/ansible/roles/cleanup/tasks/cleanup_images.yml b/ansible/roles/cleanup/tasks/cleanup_images.yml deleted file mode 100644 index 9b03f274c..000000000 --- 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/cleanup/tasks/copy_tools.yml b/ansible/roles/cleanup/tasks/copy_tools.yml deleted file mode 100644 index 192d3bf53..000000000 --- a/ansible/roles/cleanup/tasks/copy_tools.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- name: Creating /kolla-cleanup/tools directory on node - file: - state: directory - path: /tmp/kolla-cleanup/tools - -- name: Copying validate-docker-execute.sh file - copy: - src: ../tools/validate-docker-execute.sh - dest: /tmp/kolla-cleanup/tools - mode: 0755 - -- name: Copying cleanup-containers file - copy: - src: ../tools/cleanup-containers - dest: /tmp/kolla-cleanup/tools - mode: 0755 - -- name: Copying cleanup-host file - copy: - 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 deleted file mode 100644 index 13b59b7fb..000000000 --- a/ansible/roles/cleanup/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- include: copy_tools.yml - -- include: cleanup_containers.yml - -- include: cleanup_images.yml - -- include: cleanup_host.yml diff --git a/ansible/roles/destroy/defaults/main.yml b/ansible/roles/destroy/defaults/main.yml new file mode 100644 index 000000000..0d75e357d --- /dev/null +++ b/ansible/roles/destroy/defaults/main.yml @@ -0,0 +1,2 @@ +--- +destroy_include_images: no diff --git a/ansible/roles/destroy/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml new file mode 100644 index 000000000..4ccdd9cdd --- /dev/null +++ b/ansible/roles/destroy/tasks/cleanup_containers.yml @@ -0,0 +1,3 @@ +--- +- name: Destroying all Kolla containers and volumes + command: /tmp/kolla-cleanup/tools/cleanup-containers diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml new file mode 100644 index 000000000..9429eba6b --- /dev/null +++ b/ansible/roles/destroy/tasks/cleanup_host.yml @@ -0,0 +1,8 @@ +--- +- name: Destroying Kolla host configuration + command: /tmp/kolla-cleanup/tools/cleanup-host + +- 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 000000000..e6b8d6073 --- /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/destroy/tasks/copy_tools.yml b/ansible/roles/destroy/tasks/copy_tools.yml new file mode 100644 index 000000000..6a990e197 --- /dev/null +++ b/ansible/roles/destroy/tasks/copy_tools.yml @@ -0,0 +1,31 @@ +--- +- name: Creating /kolla-cleanup/tools directory on node + file: + state: directory + path: /tmp/kolla-cleanup/tools + +- name: Copying validate-docker-execute.sh file + copy: + src: ../tools/validate-docker-execute.sh + dest: /tmp/kolla-cleanup/tools + mode: 0755 + +- name: Copying cleanup-containers file + copy: + src: ../tools/cleanup-containers + dest: /tmp/kolla-cleanup/tools + mode: 0755 + +- name: Copying cleanup-host file + copy: + 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: + - destroy_include_images | bool diff --git a/ansible/roles/destroy/tasks/main.yml b/ansible/roles/destroy/tasks/main.yml new file mode 100644 index 000000000..13b59b7fb --- /dev/null +++ b/ansible/roles/destroy/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- include: copy_tools.yml + +- include: cleanup_containers.yml + +- include: cleanup_images.yml + +- include: cleanup_host.yml diff --git a/tools/kolla-ansible b/tools/kolla-ansible index d3416fb58..030f0323e 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" -- cgit v1.2.3