commit 92eb3a3806c2be540693dd7ba1ebbbec2d7e0e80
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jul 16 09:17:38 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Jul 16 09:17:38 2019 +0000
tree 24e5d032e721b60d551666065893f30cc322ca90
parent 815d502b974a0efaa729c718d2709785217b6126
parent 67d7de9b31b3b7569d14afeb18b4ae1383ca4ce6

Merge "Install python-tornado with OS CP/DP upgrade"

openstack-control-upgrade.groovy

diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index f2dd78c..4ec98da 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -173,6 +173,9 @@
         if (OS_DIST_UPGRADE.toBoolean() == true || OS_UPGRADE.toBoolean() == true) {
           debian.osUpgradeNode(env, target, upgrade_mode, false)
         }
+        // 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')
       }
 
       common.stageWrapper(upgradeStageMap, "Upgrade OpenStack", target, interactive) {

openstack-data-upgrade.groovy

diff --git a/openstack-data-upgrade.groovy b/openstack-data-upgrade.groovy
index 7458a27..ef6a527 100644
--- a/openstack-data-upgrade.groovy
+++ b/openstack-data-upgrade.groovy
@@ -158,6 +158,9 @@
         if (OS_DIST_UPGRADE.toBoolean() == true || OS_UPGRADE.toBoolean() == true) {
           debian.osUpgradeNode(env, target, upgrade_mode, false)
         }
+        // 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')
       }
 
       common.stageWrapper(upgradeStageMap, "Upgrade OpenStack", target, interactive) {