openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Remove deprecated commands from overcloud deletion 

Update overcloud delete role with new commands.

Change-Id: I0b66d3ed3371e33ffbbbb1248f9009ac11a4589a
This commit is contained in:
Sagi Shnaidman 2019-03-27 10:55:13 +02:00
parent cbd2c9ce3c
commit dddea19c92
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/overcloud-delete/tasks/main.yml
View File

@ -22,7 +22,7 @@
- name: check for delete command to complete or fail
shell: |
source {{ working_dir }}/stackrc
heat stack-show $(cat {{ working_dir }}/overcloud_id)
openstack stack show $(cat {{ working_dir }}/overcloud_id) -f yaml
delay: "{{ delete_check_delay }}"
retries: "{{ delete_check_retries }}"
until: heat_stack_show.stdout.find('DELETE_COMPLETE') != -1

10
roles/overcloud-delete/templates/overcloud_delete.sh.j2
View File

@ -7,16 +7,12 @@
source {{ working_dir }}/stackrc
OVERCLOUD_NAME="overcloud"
OVERCLOUD_ID=$(openstack stack list | grep "$OVERCLOUD_NAME" | awk '{print $2}')
OVERCLOUD_ID=$(openstack stack list -f value -c ID)
echo $OVERCLOUD_ID > {{ working_dir }}/overcloud_id
## * select the correct command for the deletion
## * delete overcloud with confirmation
## ::
if heat stack-delete --help | grep -q "\-\-yes"; then
heat stack-delete --yes "$OVERCLOUD_NAME"
else
heat stack-delete "$OVERCLOUD_NAME"
fi
openstack stack delete --yes "$OVERCLOUD_NAME"
### --stop_docs