openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Use overcloud status for failure checking"

Browse Source
This commit is contained in:
Zuul
2018-09-03 16:26:32 +00:00
committed by Gerrit Code Review
parent eedb658b4c 4efc65cffe
commit 6f5f096946
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
View File

@@ -49,8 +49,6 @@ elif ! openstack stack list | grep -Eq '(CREATE|UPDATE)_COMPLETE'; then
{%if release not in ['mitaka', 'liberty'] %} {%if release not in ['mitaka', 'liberty'] %}
# get the failures list # get the failures list
openstack stack failures list overcloud --long > {{ failed_deployment_list }} || true openstack stack failures list overcloud --long > {{ failed_deployment_list }} || true
# NOTE(emilien) "openstack overcloud failures" was introduced in Rocky
openstack overcloud failures >> {{ failed_deployment_list }} || true
{% endif %} {% endif %}
# get any puppet related errors # get any puppet related errors
@@ -72,5 +70,10 @@ elif ! openstack stack list | grep -Eq '(CREATE|UPDATE)_COMPLETE'; then
# We need to exit with 1 because of the above || true # We need to exit with 1 because of the above || true
done done
exit 1 exit 1
{%if release in ['rocky', 'master'] %}
elif ! openstack overcloud status | grep -Eq 'DEPLOY_SUCCESS'; then
# NOTE(emilien) "openstack overcloud failures" was introduced in Rocky
openstack overcloud failures >> {{ failed_deployment_list }} || true
{% endif %}
fi fi
exit $status_code exit $status_code