ceph install update
Change-Id: I7dfb0a544cde975f142d3314299daf5c14e0dcc9
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index daeb20f..bd5124e 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -686,6 +686,8 @@
def installCephMon(master, target='I@ceph:mon') {
def salt = new com.mirantis.mk.Salt()
+ salt.enforceState(master, 'I@ceph:common', 'salt.minion.grains', true)
+
// generate keyrings
if (salt.testTarget(master, 'I@ceph:mon:keyring:mon or I@ceph:common:keyring:admin')) {
salt.enforceState(master, 'I@ceph:mon:keyring:mon or I@ceph:common:keyring:admin', 'ceph.mon', true)
@@ -707,7 +709,6 @@
salt.enforceState(master, target, 'ceph.osd', true)
salt.runSaltProcessStep(master, 'I@ceph:osd', 'saltutil.sync_grains', [], null, true)
salt.enforceState(master, target, 'ceph.osd.custom', true)
- salt.enforceState(master, target, 'salt.minion.grains', true)
salt.runSaltProcessStep(master, 'I@ceph:osd', 'saltutil.sync_grains', [], null, true)
salt.runSaltProcessStep(master, 'I@ceph:osd', 'mine.update', [], null, true)
@@ -723,6 +724,7 @@
// install Ceph Radosgw
if (salt.testTarget(master, 'I@ceph:radosgw')) {
+ salt.runSaltProcessStep(master, 'I@ceph:radosgw', 'saltutil.sync_grains', [], null, true)
salt.enforceState(master, 'I@ceph:radosgw', 'ceph.radosgw', true)
}
}