commit 1afb7ea59335763abc614857713bbed5d603e88d
author Ondrej Smola <osmola@mirantis.com> Thu Apr 05 09:47:09 2018 +0000
committer Gerrit Code Review <gerrit2@7e698601da6d> Thu Apr 05 09:47:09 2018 +0000
tree 3ac86cfc16ac6b45c0da574c04e754362f7757d3
parent b2eb1f97127436d93fd371104cd778d532d821de
parent 87d1f1b26d0106a1cb2801f711797400cbfdce78

Merge "Fix prometheus update during compute node deploy"

openstack-compute-install.groovy

diff --git a/openstack-compute-install.groovy b/openstack-compute-install.groovy
index 7b9054a..7602dcf 100644
--- a/openstack-compute-install.groovy
+++ b/openstack-compute-install.groovy
@@ -98,9 +98,15 @@
                 }
             }
 
-        stage("Install monitoring") {
+        stage("Update/Install monitoring") {
+            //Collect Grains
+            salt.enforceState(pepperEnv, targetLiveAll, 'salt.minion.grains')
+            salt.runSaltProcessStep(pepperEnv, targetLiveAll, 'saltutil.refresh_modules')
+            salt.runSaltProcessStep(pepperEnv, targetLiveAll, 'mine.update')
+            sleep(5)
+
             salt.enforceState(pepperEnv, targetLiveAll, 'prometheus')
-            salt.enforceState(pepperEnv, 'I@prometheus', 'prometheus')
+            salt.enforceState(pepperEnv, 'I@prometheus:server', 'prometheus')
         }
 
         } catch (Throwable e) {