commit 0c16edc6ca11e65330e748050af0ca3b98f750cb
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Thu Jan 30 20:05:22 2020 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Thu Jan 30 16:07:50 2020 +0000
tree 2a6d02c3268d2f7f400f6d74cb29ea971df9b6d5
parent dd293f3b475968a238d44af304b12b9a22e81423

Increase timeout to wait computes after reboot

Check minion readiness after node was rebooted

PROD-34514

Change-Id: I56d8ae2da52fff78e38befcca80c0f3186d7ccb8

openstack-data-upgrade.groovy

diff --git a/openstack-data-upgrade.groovy b/openstack-data-upgrade.groovy
index e768564..d2161bc 100644
--- a/openstack-data-upgrade.groovy
+++ b/openstack-data-upgrade.groovy
@@ -160,8 +160,9 @@
           upgrade_mode = 'upgrade'
         }
         if (OS_DIST_UPGRADE.toBoolean() == true || OS_UPGRADE.toBoolean() == true) {
-          debian.osUpgradeNode(env, target, upgrade_mode, false)
+          debian.osUpgradeNode(env, target, upgrade_mode, false, 60, 10)
         }
+        salt.checkTargetMinionsReady(['saltId': env, 'target': target, wait: 60, timeout: 10])
         // Workaround for PROD-31413, install python-tornado from latest release if available and
         // restart minion to apply new code.
         salt.upgradePackageAndRestartSaltMinion(env, target, 'python-tornado')