From e508323f6b73e2d02de53229a3861fb33960134a Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Mon, 30 Apr 2018 20:03:19 -0400
Subject: [PATCH] Convert resource_name to number

When sorting by resource_name, first convert it to a number so that
it's sorted correctly. Otherwise, deployments with > 10 nodes could
configure nodes out of order.

Change-Id: I604428dacd63140f4e89b45c55f7eb859df27fe7
Closes-Bug: #1768158
(cherry picked from commit 49d072133563dde3c7693e8dacbfdaafac121329)
---
 deployed-server/scripts/get-occ-config.sh                    | 2 +-
 .../convert-resource-name-to-number-80ada6c825554f56.yaml    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/convert-resource-name-to-number-80ada6c825554f56.yaml

diff --git a/deployed-server/scripts/get-occ-config.sh b/deployed-server/scripts/get-occ-config.sh
index c00c26efc0..77c6d71f57 100755
--- a/deployed-server/scripts/get-occ-config.sh
+++ b/deployed-server/scripts/get-occ-config.sh
@@ -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
diff --git a/releasenotes/notes/convert-resource-name-to-number-80ada6c825554f56.yaml b/releasenotes/notes/convert-resource-name-to-number-80ada6c825554f56.yaml
new file mode 100644
index 0000000000..91e6c4970f
--- /dev/null
+++ b/releasenotes/notes/convert-resource-name-to-number-80ada6c825554f56.yaml
@@ -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.