move ceph setup after osd installation
Change-Id: Iae487f26ae7e84bd1b2630681d2b4a27a3bbd1e7
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 184106b..2bc90e5 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -647,19 +647,14 @@
// Ceph
//
-def installCephMon(master, target='I@ceph:mon', setup=true) {
+def installCephMon(master, target='I@ceph:mon') {
def salt = new com.mirantis.mk.Salt()
// install Ceph Mons
salt.enforceState(master, target, 'ceph.mon', true)
-
- // setup poools, keyrings and maybe crush
- if (salt.testTarget(master, 'I@ceph:setup') && setup) {
- salt.enforceState(master, 'I@ceph:setup', 'ceph.setup', true)
- }
}
-def installCephOsd(master, target='I@ceph:osd') {
+def installCephOsd(master, target='I@ceph:osd', setup=true) {
def salt = new com.mirantis.mk.Salt()
// Prapare filesystem on OSD drives
@@ -667,6 +662,11 @@
// install Ceph OSDs
salt.enforceState(master, target, 'ceph.osd', true)
+
+ // setup poools, keyrings and maybe crush
+ if (salt.testTarget(master, 'I@ceph:setup') && setup) {
+ salt.enforceState(master, 'I@ceph:setup', 'ceph.setup', true)
+ }
}
def installCephClient(master) {