commit 3f210113295cea2b1fe762b2e04bd219a0599558
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Sep 07 17:13:46 2020 +0000
committer Gerrit Code Review <mail@domain.com> Mon Sep 07 17:13:46 2020 +0000
tree 44ba1b3e7eb3efe826f22d05ea78d9fa40da58e2
parent 8f976f42237f05e8edb2f77469998105e5dc645f
parent 8e0bd55af431c952cc879924ea7e249bfafa6fa3

Merge "Removed condition for short path in order to allow re-run the pipeline"

ceph-remove-osd.groovy

diff --git a/ceph-remove-osd.groovy b/ceph-remove-osd.groovy
index 015dcd2..680cd42 100644
--- a/ceph-remove-osd.groovy
+++ b/ceph-remove-osd.groovy
@@ -66,15 +66,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