From: Michael Fritch <mfritch@suse.com>
Date: Fri, 27 Mar 2020 14:11:09 +0000 (-0600)
Subject: mgr/cephadm: remove stray regexp
X-Git-Tag: v15.2.2~76^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=251fb60bcfb90edbdce0a1610aff0cdf69c94c3a;p=ceph.git

mgr/cephadm: remove stray regexp

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 988b3cb76e3f8a9bbf2c83485c1d009305a4d025)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 7d8507fe104..4d034fc8012 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1261,7 +1261,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         Returns the generic service name
         """
         p = re.compile(r'(.*)\.%s.*' % (host))
-        p.sub(r'\1', daemon_id)
         return '%s.%s' % (daemon_type, p.sub(r'\1', daemon_id))
 
     def _save_inventory(self):