]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure 46974/head
authordparmar18 <dparmar@redhat.com>
Tue, 14 Jun 2022 20:30:48 +0000 (02:00 +0530)
committerAdam King <adking@redhat.com>
Tue, 5 Jul 2022 17:22:42 +0000 (13:22 -0400)
Fixes: https://tracker.ceph.com/issues/56024
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit 6436acc4b51b52635f8fa0e56cd79ba66c028d81)

src/pybind/mgr/cephadm/serve.py

index 7e84583da1b7839fdc82bd20bcd55234ea67eadc..7ac6fee88e2cd476722cd7132ea9de58646888c3 100644 (file)
@@ -1047,6 +1047,8 @@ class CephadmServe:
             self.mgr.cache.update_client_file(host, path, digest, mode, uid, gid)
             updated_files = True
         for path in old_files.keys():
+            if path == '/etc/ceph/ceph.conf':
+                continue
             self.log.info(f'Removing {host}:{path}')
             with self._remote_connection(host) as tpl:
                 conn, connr = tpl