commit 9f68a42a66bbb1382b0419a88d9042c62ffa365d
author Tomek Jaroszyk <tjaroszyk@mirantis.com> Wed Sep 09 12:41:01 2020 +0200
committer Tomek Jaroszyk <tjaroszyk@mirantis.com> Wed Sep 09 12:41:01 2020 +0200
tree 9c0a238d7ed1a09cd41aa47a5cfd1968f1ba7d35
parent 27613fea5f4fbab1a5a454a08c30ded786446faa

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 c0a5636..6b40f17 100644
--- a/ceph-upgrade.groovy
+++ b/ceph-upgrade.groovy
@@ -242,11 +242,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")
             }
         }