Fix race in ceph keyring setup
On secondary nodes mine is used to get pillar from
'ceph:common:keyring:admin' node via grain.items
We need to refresh both pillar and grains before starting
ceph.mon state on secondary nodes.
Change-Id: I6fd1fb68b7611f71e5106fa96526096bf827d084
Related-Prod: PROD-24613
(cherry picked from commit 03ed4e7aaef368dfa8e616d024a26ebfe97a767d)
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index e230427..d1fb255 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -1122,6 +1122,11 @@
salt.enforceState(master, "( I@ceph:mon:keyring:mon or I@ceph:common:keyring:admin ) ${extra_tgt}", 'ceph.mon')
salt.runSaltProcessStep(master, "I@ceph:mon ${extra_tgt}", 'saltutil.sync_grains')
salt.runSaltProcessStep(master, "( I@ceph:mon:keyring:mon or I@ceph:common:keyring:admin ) ${extra_tgt}", 'mine.update')
+
+ // on target nodes mine is used to get pillar from 'ceph:common:keyring:admin' via grain.items
+ // we need to refresh all pillar/grains to make data sharing work correctly
+ salt.fullRefresh(master, "( I@ceph:mon:keyring:mon or I@ceph:common:keyring:admin ) ${extra_tgt}")
+
sleep(5)
}
// install Ceph Mons