From: dparmar18 <dparmar@redhat.com>
Date: Tue, 14 Jun 2022 20:30:48 +0000 (+0530)
Subject: pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure
X-Git-Tag: v17.2.6~130^2~13^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a89cd50b2f4dfd85e1248e3d403adaf66393edc9;p=ceph.git

pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure

Fixes: https://tracker.ceph.com/issues/56024

Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit 6436acc4b51b52635f8fa0e56cd79ba66c028d81)
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 207f3c6ba49f6..146f9f8c8dea4 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -1065,6 +1065,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}')
             cmd = ['rm', '-f', path]
             self.mgr.ssh.check_execute_command(host, cmd)