]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm/serve: fix if conf [global] doesn't exist.
authorRongqi Sun <sunrongqi@huawei.com>
Fri, 24 Mar 2023 07:50:38 +0000 (15:50 +0800)
committerRongqi Sun <sunrongqi@huawei.com>
Fri, 24 Mar 2023 08:28:54 +0000 (16:28 +0800)
Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
src/pybind/mgr/cephadm/serve.py

index 67a7038ce231a62b17a7c58d56229748925b3924..7342ee20bd7b65f1589a7ef9d691c8f405c852e5 100644 (file)
@@ -1233,12 +1233,14 @@ class CephadmServe:
                         daemon_spec.extra_args.extend(['--objectstore', spec.objectstore])
                         final_conf = daemon_spec.final_config['config']
                         objectstore_str = '\tosd_objectstore = ' + spec.objectstore + '\n'
+                        index = 0
                         if final_conf.find("[osd]") != -1:
                             index = final_conf.index("[osd]") + 5
-                        else:
+                        elif final_conf.find("[global]") != -1:
                             index = final_conf.index("[global]") + 8
-                        final_conf = final_conf[:index] + objectstore_str + final_conf[index:]
-                        daemon_spec.final_config['config'] = final_conf
+                        if index != 0:
+                            final_conf = final_conf[:index] + objectstore_str + final_conf[index:]
+                            daemon_spec.final_config['config'] = final_conf
 
                 if reconfig:
                     daemon_spec.extra_args.append('--reconfig')