commit 96ab5b0a3c5593561cb975c2c1672982f11118a9
author Jiri Broulik <jbroulik@mirantis.com> Tue May 15 12:54:33 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Tue May 15 12:54:33 2018 +0000
tree aad4cd5cb7edc7eb525eace385530df92a00d0a1
parent fba41b23a92b2edfb3be4db6fbd22a06dc919169
parent f610c573e2c5929f2741a8d31afabe224adf2cc8

Merge "Sync grains before hosts update"

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 9e81415..b7c8b16 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -46,6 +46,8 @@
     salt.enforceState(master, 'I@linux:system', ['linux', 'openssh', 'ntp', 'rsyslog'])
     salt.enforceState(master, '*', ['salt.minion'], true, false, null, false, 60, 2)
     sleep(5)
+
+    salt.fullRefresh(master, "*")
     salt.runSaltProcessStep(master, '*', 'mine.update', [], null, true)
     salt.enforceState(master, '*', ['linux.network.host'])
 
@@ -83,6 +85,8 @@
     sleep(5)
     salt.enforceState(master, target, ['linux', 'openssh', 'ntp', 'rsyslog'])
     sleep(5)
+
+    salt.fullRefresh(master, target)
     salt.runSaltProcessStep(master, target, 'mine.update', [], null, true)
     salt.enforceState(master, target, ['linux.network.host'])
 }