commit b039845488e15de8ce6f32184948b6c5bcdf6014
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Sep 08 14:19:16 2020 +0000
committer Gerrit Code Review <mail@domain.com> Tue Sep 08 14:19:16 2020 +0000
tree d4ad787c3a65bbad3515a39976db7406e5e197c8
parent 2b6070cdebebf659548cb5c5de961cd4972b6acb
parent 2683a0ee074551671f3f9eed25709ecf9664868f

Merge "add optional step for wipe orpaned ceph's partitions" into release/proposed/2019.2.0

ceph-remove-osd.groovy

diff --git a/ceph-remove-osd.groovy b/ceph-remove-osd.groovy
index 7b00aa5..405d478 100644
--- a/ceph-remove-osd.groovy
+++ b/ceph-remove-osd.groovy
@@ -69,15 +69,11 @@
                 }
             }
 
-            if ( osd_ids == [] )
-            {
-              currentBuild.result = 'SUCCESS'
-              return
-            }
-
             // `ceph osd out <id> <id>`
             stage('Set OSDs out') {
-                salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd out ' + osd_ids.join(' '))
+                if ( !osd_ids.isEmpty() ) {
+                    salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd out ' + osd_ids.join(' '))
+                }
             }
 
             // wait for healthy cluster