aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 02:35:43 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 02:35:43 +0000
commit661c6a059ff40fe986bfd4488345dfcf0d8187cc (patch)
treeb2abcf497cecfe36dc699c204539c3f2168398b9 /tools
parent969fccdede480bf81fc393575e4e143bbef545b5 (diff)
parent6d45786d5992a62af08ee4bed31094b6834daf41 (diff)
downloadkolla-661c6a059ff40fe986bfd4488345dfcf0d8187cc.tar.gz
kolla-661c6a059ff40fe986bfd4488345dfcf0d8187cc.zip
Merge "Change cleanup to destroy as cleanup is a misnomer"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kolla-ansible10
1 files changed, 5 insertions, 5 deletions
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"