commit bb35289151e787bc611eeb1415667fde1edfd544
author Mateusz Los <mlos@mirantis.com> Wed Oct 09 11:36:10 2019 +0200
committer Mateusz Los <mlos@mirantis.com> Wed Oct 09 11:43:20 2019 +0200
tree 18ae6f68d68f226e4387885ac3f54ce188b24c1a
parent e0c88433ee8538b7243fa22fc3e12390db70c5d0

ceph-remove-node: add additional checks before running ceph.setup.crush state

Change-Id: I82db0de534bab0289adf94a2d230ccbd3c01919c
Related-Prod: PROD-32501

ceph-remove-node.groovy

diff --git a/ceph-remove-node.groovy b/ceph-remove-node.groovy
index 0fba6a0..766dda1 100644
--- a/ceph-remove-node.groovy
+++ b/ceph-remove-node.groovy
@@ -304,7 +304,8 @@
             }
         }
 
-        if (HOST_TYPE.toLowerCase() == 'osd' && GENERATE_CRUSHMAP.toBoolean() == true) {
+        def crushmap_target = salt.getMinions(pepperEnv, "I@ceph:setup:crush")
+        if (HOST_TYPE.toLowerCase() == 'osd' && GENERATE_CRUSHMAP.toBoolean() == true && crushmap_target ) {
             stage('Generate CRUSHMAP') {
                 salt.enforceState(pepperEnv, 'I@ceph:setup:crush', 'ceph.setup.crush', true)
             }