commit b28bef8b20c8dce1b779af8bdf3c12af153ec132
author Oleksii Grudev <ogrudev@mirantis.com> Fri Nov 30 11:04:13 2018 +0200
committer Oleksii Grudev <ogrudev@mirantis.com> Fri Nov 30 11:04:13 2018 +0200
tree 58505a60baaea36f34539f58274b7d224867b5d2
parent 6d678da10f613d7fe05ccaa0307d31dd54408606

Remove states execution  duplication

The patch removes second execution of application
salt states in case OS upgrade and OS dist upgrade
are not executed

Change-Id: Ie924a92785637e3653a903545455d610f9ee1dfb

openstack-control-upgrade.groovy

diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 5febb3c..2f4b2a6 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -184,9 +184,9 @@
         }
         if (OS_DIST_UPGRADE.toBoolean() == true || OS_UPGRADE.toBoolean() == true) {
           debian.osUpgradeNode(env, target, upgrade_mode, false)
+          openstack.applyOpenstackAppsStates(env, target)
+          openstack.runOpenStackUpgradePhase(env, target, 'verify')
         }
-        openstack.applyOpenstackAppsStates(env, target)
-        openstack.runOpenStackUpgradePhase(env, target, 'verify')
       }
     }
   }