openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Avoid overcloud validate timeout on stack failure 

Currently the wait_for call on the validate stack does not included a
--fail-match argument. This means that if the validate heat stack goes
to CREATE_FAILED, wait_for will continue polling until --walltime.
Related-Bug: #1709327

Change-Id: I473df0dc267134d472d69ab43459ffbbd872ffa0
This commit is contained in:
Steve Baker 2017-08-14 10:48:46 +12:00
parent 221f94f8de
commit 6c45808360
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/validate-simple/defaults/main.yml
View File

@ -5,6 +5,7 @@ validate_template: tenantvm_floatingip.yaml
validate_log: "{{ working_dir }}/overcloud_validate.log"
validate_stack_name: pingtest_stack
validate_success_status: CREATE_COMPLETE
validate_failed_status: CREATE_FAILED
validate_image_file: cirros-0.3.5-x86_64-uec.tar.gz
validate_image_url: "http://download.cirros-cloud.net/0.3.5/"
validate_image_path: "/opt/stack/cache/files/{{ validate_image_file }}"

3
roles/validate-simple/templates/overcloud-validate.sh.j2
View File

@ -134,7 +134,8 @@ openstack stack create {{ validate_stack_name }} \
### --stop_docs
/bin/bash {{ working_dir }}/wait_for -w 600 --delay 30 \
--success-match {{ validate_success_status }} -- heat stack-show {{ validate_stack_name }}
--success-match {{ validate_success_status }} \
--fail-match {{ validate_failed_status }} -- heat stack-show {{ validate_stack_name }}
sleep 30
### --start_docs