Merge "Convert resource_name to number" into stable/queens

This commit is contained in:
Zuul 2018-05-25 23:52:57 +00:00 committed by Gerrit Code Review
commit d060c8abf9
2 changed files with 6 additions and 1 deletions

View File

@ -106,7 +106,7 @@ for role in $OVERCLOUD_ROLES; do
stacks=$(with_backoff fail_if_empty openstack stack resource list $rg_stack -c resource_name -c physical_resource_id -f json | jq -r "sort_by(.resource_name) | .[] | .physical_resource_id")
rc=${?}
while [ ${rc} -ne 0 ]; do
stacks=$(with_backoff fail_if_empty openstack stack resource list $rg_stack -c resource_name -c physical_resource_id -f json | jq -r "sort_by(.resource_name) | .[] | .physical_resource_id")
stacks=$(with_backoff fail_if_empty openstack stack resource list $rg_stack -c resource_name -c physical_resource_id -f json | jq -r "sort_by(.resource_name | tonumber) | .[] | .physical_resource_id")
done
i=0

View File

@ -0,0 +1,5 @@
---
fixes:
- Previously, get-occ-config.sh could configure nodes out of order when
deploying with more than 10 nodes. The script has been updated to properly
sort the node resource names by first converting the names to a number.