From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 22:23:38 +0000 (-0600)
Subject: mon/ConfigKeyService: remove config-key set warning
X-Git-Tag: v15.1.0~171^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08f48c49a7311e32e6cd2b01cb12897bab5ba4a7;p=ceph.git

mon/ConfigKeyService: remove config-key set warning

This has been there for both mimic and nautilus; we can drop it for
octopus.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc
index 38a22d16496e..566543657a26 100644
--- a/src/mon/ConfigKeyService.cc
+++ b/src/mon/ConfigKeyService.cc
@@ -237,18 +237,6 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op)
       goto out;
     }
 
-    std::string mgr_prefix = "mgr/";
-    if (key.size() >= mgr_prefix.size() &&
-        key.substr(0, mgr_prefix.size()) == mgr_prefix) {
-      // In <= mimic, we used config-key for mgr module configuration,
-      // and we bring values forward in an upgrade, but subsequent
-      // `set` operations will not be picked up.  Warn user about this.
-      ss << "WARNING: it looks like you might be trying to set a ceph-mgr "
-            "module configuration key.  Since Ceph 13.0.0 (Mimic), mgr module "
-            "configuration is done with `config set`, and new values "
-            "set using `config-key set` will be ignored.\n";
-    }
-
     ss << "set " << key;
 
     // we'll reply to the message once the proposal has been handled