commit 5836e3d4084dccff7be0b33695914c612bff81d8
author Tomáš Kukrál <tkukral@mirantis.com> Fri Aug 25 18:20:55 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Mon Aug 28 15:58:53 2017 +0000
tree 410f59cf9df473bf6ee08b7053d7cc415d8222ae
parent cf44f81664e53938a025d86fd8e20f29196e5f33

run setup after mon installation

Change-Id: I9cd2ca7da39563b92c73180e08827aa4dc95bd84

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 36350d8..d24d79b 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -637,11 +637,16 @@
 // Ceph
 //
 
-def installCephMon(master, target='I@ceph:mon') {
+def installCephMon(master, target='I@ceph:mon', setup=true) {
     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') {
@@ -654,9 +659,11 @@
     salt.enforceState(master, target, 'ceph.osd', true)
 }
 
-def installCephRadosgw(master, target='I@ceph:radosgw') {
+def installCephClient(master) {
     def salt = new com.mirantis.mk.Salt()
 
     // install Ceph Radosgw
-    salt.enforceState(master, target, 'ceph.radosgw', true)
+    if (salt.testTarget(master, 'I@ceph:radosgw')) {
+        salt.enforceState(master, target, 'ceph.radosgw', true)
+    }
 }