commit d7c01dcbc6de8560fc3c6becfba6dcd2c8fb7c6f
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Feb 13 19:18:17 2020 +0000
committer Gerrit Code Review <mail@domain.com> Thu Feb 13 19:18:17 2020 +0000
tree 78a89d36b9b4355dc20cbac73d01ecc402106fa0
parent 5172f478015fff3fa0cf3a8370495b2095c8ea75
parent 9085e84404bcc9f8455f3ddbda5c24d34cfa57ec

Merge "Fix flag set for upgrade to nautilus release"

ceph-upgrade.groovy

diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index 97acb07..86051c0 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -188,6 +188,9 @@
                 for (flag in flags) {
                     salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd set ' + flag)
                 }
+                if (ORIGIN_RELEASE == 'jewel') {
+                    salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd set sortbitwise')
+                }
             }
         }
 
@@ -223,7 +226,6 @@
                         common.infoMsg('Removing flag ' + flag)
                         salt.cmdRun(pepperEnv, ADMIN_HOST, 'ceph osd unset ' + flag)
                     }
-
                 }
             }
         }