Merge "Change cleanup to destroy as cleanup is a misnomer"

ansible/destroy.yml

@@ -1,4 +1,4 @@
 ---
 - hosts: all
   roles:
-    - cleanup
+    - destroy

ansible/roles/cleanup/defaults/main.yml

@@ -1,2 +0,0 @@
----
-cleanup_include_images: no

ansible/roles/cleanup/tasks/cleanup_images.yml

@@ -1,5 +0,0 @@
----
-- name: Cleaning Kolla images
-  command: /tmp/kolla-cleanup/tools/cleanup-images
-  when:
-    - cleanup_include_images | bool

ansible/roles/destroy/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+destroy_include_images: no

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

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

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

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

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
+    destroy             Destroy Kolla containers, volumes and host configuration
-                        ('-e cleanup_include_images=yes' to also remove Kolla images)
+                        ('-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)
+(destroy)
-        ACTION="Cleanup containers, volumes and host"
+        ACTION="Destroy Kolla containers, volumes and host configuration"
-        PLAYBOOK="${BASEDIR}/ansible/cleanup.yml"
+        PLAYBOOK="${BASEDIR}/ansible/destroy.yml"
         ;;
 (deploy)
         ACTION="Deploying Playbooks"