From 63f803c4a9bcd9cab2fda239008dd8f8b104c216 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Tue, 22 Aug 2017 09:21:14 +0000 Subject: [PATCH] Partially revert "Set resource class during upgrade" This reverts part of commit 30bc3c0933a1072e5e4c48b4614f5f387ffd8327. On master, when upgrading from pike to queens in grenade, we already create all the nodes with a resource class being set, so no need to update it. We still pass the parameters to verify and verify_noapi as that's what grenade does. Change-Id: Ic7c3218fe95ef9f73d358216831158a1ec025fba --- devstack/upgrade/resources.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 040ecab80e..aff54e1bb0 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -93,15 +93,7 @@ function create { } function verify { - local side="$1" - - if [[ "$side" = "post-upgrade" ]]; then - nodes=$(openstack --os-baremetal-api-version 1.9 baremetal node list --provision-state active -f value -c UUID) - # Trigger nova flavor migration code for active instances. - for node_id in $nodes; do - openstack --os-baremetal-api-version 1.21 baremetal node set $node_id --resource-class baremetal - done - fi + : } function verify_noapi {