diff options
| author | Duane DeCapite <ddecapit@cisco.com> | 2016-08-05 14:01:38 -0400 |
|---|---|---|
| committer | Duane DeCapite <ddecapit@cisco.com> | 2016-08-08 13:37:10 -0400 |
| commit | 6d45786d5992a62af08ee4bed31094b6834daf41 (patch) | |
| tree | adf92a6ff54a9f84e1d4753dbf938c06fec0f3e6 | |
| parent | 3071d32a3fb76e72901112a9b3e7fc59233f54bf (diff) | |
| download | kolla-6d45786d5992a62af08ee4bed31094b6834daf41.tar.gz kolla-6d45786d5992a62af08ee4bed31094b6834daf41.zip | |
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
| -rw-r--r-- | ansible/destroy.yml (renamed from ansible/cleanup.yml) | 2 | ||||
| -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/destroy/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/destroy/tasks/cleanup_containers.yml (renamed from ansible/roles/cleanup/tasks/cleanup_containers.yml) | 2 | ||||
| -rw-r--r-- | ansible/roles/destroy/tasks/cleanup_host.yml (renamed from ansible/roles/cleanup/tasks/cleanup_host.yml) | 4 | ||||
| -rw-r--r-- | ansible/roles/destroy/tasks/cleanup_images.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/destroy/tasks/copy_tools.yml (renamed from ansible/roles/cleanup/tasks/copy_tools.yml) | 2 | ||||
| -rw-r--r-- | ansible/roles/destroy/tasks/main.yml (renamed from ansible/roles/cleanup/tasks/main.yml) | 0 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 10 |
10 files changed, 17 insertions, 17 deletions
diff --git a/ansible/cleanup.yml b/ansible/destroy.yml index 14d5668cf..73b087072 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 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_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/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/cleanup/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml index 1de152267..4ccdd9cdd 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 index 266ce1752..9429eba6b 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 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/cleanup/tasks/copy_tools.yml b/ansible/roles/destroy/tasks/copy_tools.yml index 192d3bf53..6a990e197 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 index 13b59b7fb..13b59b7fb 100644 --- a/ansible/roles/cleanup/tasks/main.yml +++ b/ansible/roles/destroy/tasks/main.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" |