]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: eliminate duplication of [global] section when applying set-extra-ceph-conf
authorRongqi Sun <sunrongqi@huawei.com>
Wed, 1 Mar 2023 08:15:26 +0000 (16:15 +0800)
committerRongqi Sun <sunrongqi@huawei.com>
Wed, 1 Mar 2023 08:15:26 +0000 (16:15 +0800)
Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
src/pybind/mgr/cephadm/module.py

index 42bb65a7279d62dfb89ddba22ef6e7b308e9f343..b567871bd21fbc75846a0d17500b021b44c740d0 100644 (file)
@@ -1905,7 +1905,7 @@ Then run the following:
         })
         extra = self.extra_ceph_conf().conf
         if extra:
-            config += '\n\n' + extra.strip() + '\n'
+            config += extra.strip().replace('[global]','') + '\n'
         return config
 
     def _invalidate_daemons_and_kick_serve(self, filter_host: Optional[str] = None) -> None: