commit df8c3535ca755da42dee29258878de34ac24407f
author Tomek Jaroszyk <tjaroszyk@mirantis.com> Wed Sep 09 12:41:01 2020 +0200
committer tjaroszyk <tjaroszyk@mirantis.com> Wed Sep 09 11:07:39 2020 +0000
tree 99c45f76322e7a4ec1059431fd9c80a2cc9ca674
parent b039845488e15de8ce6f32184948b6c5bcdf6014

Enforce new config with ceph.common instead of highstates

Related-Prod: PROD-35756
Change-Id: Ic07468b176f3d562e35ffbda4927135179a549cd

ceph-upgrade.groovy

diff --git a/ceph-upgrade.groovy b/ceph-upgrade.groovy
index 7585a01..6b495be 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(master, "I@ceph:common", "ceph.common")
             }
         }