]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure 47072/head
authordparmar18 <dparmar@redhat.com>
Tue, 14 Jun 2022 20:30:48 +0000 (02:00 +0530)
committerAdam King <adking@redhat.com>
Wed, 13 Jul 2022 00:45:04 +0000 (20:45 -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 207f3c6ba49f68a4795cd073a52793f7abe1f283..146f9f8c8dea4f7f9ca50abb2b6d09f52d90d641 100644 (file)
@@ -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)