From: Tim Serong <tserong@suse.com>
Date: Wed, 6 May 2020 11:12:56 +0000 (+1000)
Subject: mgr/cephadm: refresh osd config when mons change
X-Git-Tag: v15.2.4~73^2~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0224acb7c8deef9e9e7145d7fa7ef4d183b19bd3;p=ceph.git

mgr/cephadm: refresh osd config when mons change

OSDs don't have a service spec, so the previous implementation
was not reconfiguring them when the list of mons changed.

Fixes: https://tracker.ceph.com/issues/45393
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit e4aa556fd0e2859b3992274b64d40e0f0561c76f)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 70922599cb27..157126a3aa20 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2082,7 +2082,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 self._remove_daemon(dd.name(), dd.hostname)
 
             # ignore unmanaged services
-            if not spec or spec.unmanaged:
+            if spec and spec.unmanaged:
                 continue
 
             # dependencies?