From: Rongqi Sun <sunrongqi@huawei.com>
Date: Fri, 24 Mar 2023 07:50:38 +0000 (+0800)
Subject: cephadm/serve: fix if conf [global] doesn't exist.
X-Git-Tag: v19.0.0~1274^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0faef160ea354c4e176d141d68444cec04732b9;p=ceph.git

cephadm/serve: fix if conf [global] doesn't exist.

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 67a7038ce231..7342ee20bd7b 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -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')