]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure 46676/head
authordparmar18 <dparmar@redhat.com>
Tue, 14 Jun 2022 20:30:48 +0000 (02:00 +0530)
committerdparmar18 <dparmar@redhat.com>
Tue, 14 Jun 2022 20:33:02 +0000 (02:03 +0530)
Fixes: https://tracker.ceph.com/issues/56024
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
src/pybind/mgr/cephadm/serve.py

index 2de63019f4ee72635258164b07f162265ffb7192..a9c6390c915316c8ed74b97e5094dd7352c21669 100644 (file)
@@ -1069,6 +1069,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)