commit 530b7036f71d6981251e3433884e83f5351ec952
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Oct 21 13:47:16 2020 +0000
committer Gerrit Code Review <mail@domain.com> Wed Oct 21 13:47:16 2020 +0000
tree e8697f010e300bb1ee2b901c0b83ebb250d402c8
parent f3546567d1c0bfee13b23ab582f80dd40c48d159
parent cff0741359881e80c47911f0d0814e9e995c638e

Merge "Adding OS db cleanup job pipeline" into release/proposed/2019.2.0

ceph-upgrade.groovy

diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index 7585a01..25b4748 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -241,11 +241,7 @@
                 if (TARGET_RELEASE == 'nautilus' ) {
                     salt.cmdRun(pepperEnv, ADMIN_HOST, "ceph mon enable-msgr2")
                 }
-                if(RUNHIGHSTATE.toBoolean()) {
-                    salt.enforceHighstate(pepperEnv, "I@ceph:mon or I@ceph:mgr", '', false, true, 1)
-                    salt.enforceHighstate(pepperEnv, "I@ceph:radosgw", '', false, true, 1)
-                    salt.enforceHighstate(pepperEnv, "I@ceph:osd", '', false, true, 1)
-                }
+                salt.enforceState(pepperEnv, "I@ceph:common", "ceph.common")
             }
         }