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
This commit is contained in:
parent
3071d32a3f
commit
6d45786d59
@ -1,4 +1,4 @@
|
|||||||
---
|
---
|
||||||
- hosts: all
|
- hosts: all
|
||||||
roles:
|
roles:
|
||||||
- cleanup
|
- destroy
|
@ -1,2 +0,0 @@
|
|||||||
---
|
|
||||||
cleanup_include_images: no
|
|
@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Cleaning Kolla images
|
|
||||||
command: /tmp/kolla-cleanup/tools/cleanup-images
|
|
||||||
when:
|
|
||||||
- cleanup_include_images | bool
|
|
2
ansible/roles/destroy/defaults/main.yml
Normal file
2
ansible/roles/destroy/defaults/main.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
---
|
||||||
|
destroy_include_images: no
|
@ -1,3 +1,3 @@
|
|||||||
---
|
---
|
||||||
- name: Cleaning all containers and volumes
|
- name: Destroying all Kolla containers and volumes
|
||||||
command: /tmp/kolla-cleanup/tools/cleanup-containers
|
command: /tmp/kolla-cleanup/tools/cleanup-containers
|
@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
- name: Cleaning host
|
- name: Destroying Kolla host configuration
|
||||||
command: /tmp/kolla-cleanup/tools/cleanup-host
|
command: /tmp/kolla-cleanup/tools/cleanup-host
|
||||||
|
|
||||||
- name: Removing kolla-cleanup folder
|
- name: Destroying kolla-cleanup folder
|
||||||
file:
|
file:
|
||||||
path: /tmp/kolla-cleanup
|
path: /tmp/kolla-cleanup
|
||||||
state: absent
|
state: absent
|
5
ansible/roles/destroy/tasks/cleanup_images.yml
Normal file
5
ansible/roles/destroy/tasks/cleanup_images.yml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
- name: Destroying Kolla images
|
||||||
|
command: /tmp/kolla-cleanup/tools/cleanup-images
|
||||||
|
when:
|
||||||
|
- destroy_include_images | bool
|
@ -28,4 +28,4 @@
|
|||||||
dest: /tmp/kolla-cleanup/tools
|
dest: /tmp/kolla-cleanup/tools
|
||||||
mode: 0755
|
mode: 0755
|
||||||
when:
|
when:
|
||||||
- cleanup_include_images | bool
|
- destroy_include_images | bool
|
@ -42,8 +42,8 @@ Commands:
|
|||||||
prechecks Do pre-deployment checks for hosts
|
prechecks Do pre-deployment checks for hosts
|
||||||
mariadb_recovery Recover a completely stopped mariadb cluster
|
mariadb_recovery Recover a completely stopped mariadb cluster
|
||||||
deploy Deploy and start all kolla containers
|
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
|
post-deploy Do post deploy on deploy node
|
||||||
pull Pull all images for containers (only pulls, no running container changes)
|
pull Pull all images for containers (only pulls, no running container changes)
|
||||||
reconfigure Reconfigure OpenStack service
|
reconfigure Reconfigure OpenStack service
|
||||||
@ -140,9 +140,9 @@ case "$1" in
|
|||||||
EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
|
EXTRA_OPTS="$EXTRA_OPTS -e action=deploy"
|
||||||
PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml"
|
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)
|
(deploy)
|
||||||
ACTION="Deploying Playbooks"
|
ACTION="Deploying Playbooks"
|
||||||
|
Loading…
Reference in New Issue
Block a user