diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-09 02:35:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-09 02:35:43 +0000 |
| commit | 661c6a059ff40fe986bfd4488345dfcf0d8187cc (patch) | |
| tree | b2abcf497cecfe36dc699c204539c3f2168398b9 /ansible | |
| parent | 969fccdede480bf81fc393575e4e143bbef545b5 (diff) | |
| parent | 6d45786d5992a62af08ee4bed31094b6834daf41 (diff) | |
| download | kolla-661c6a059ff40fe986bfd4488345dfcf0d8187cc.tar.gz kolla-661c6a059ff40fe986bfd4488345dfcf0d8187cc.zip | |
Merge "Change cleanup to destroy as cleanup is a misnomer"
Diffstat (limited to 'ansible')
| -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 |
9 files changed, 12 insertions, 12 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 |