Merge "Remove deprecated commands from overcloud deletion"
This commit is contained in:
commit
2929fc4a6f
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue