cephadm: add default conf and fix objectstore case.

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 7342ee20bd7b65f1589a7ef9d691c8f405c852e5..fb2d400b3a0de67dbc12ed3558fb524df6631435 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -1241,6 +1241,8 @@ class CephadmServe:
                         if index != 0:
                             final_conf = final_conf[:index] + objectstore_str + final_conf[index:]
                             daemon_spec.final_config['config'] = final_conf
+                    else:
+                        daemon_spec.extra_args.extend(['--objectstore', 'bluestore'])
 
                 if reconfig:
                     daemon_spec.extra_args.append('--reconfig')

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 7675c120ec7bc3975c5436c7da0914fdea1dfd41..bcaaecd6fa6f3650fb215b9c2db6f90422d49604 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -120,7 +120,7 @@ def with_osd_daemon(cephadm_module: CephadmOrchestrator, _run_cephadm, host: str
                   ['--', 'lvm', 'list', '--format', 'json'], no_fsid=False, error_ok=False, image='', log_output=True),
         mock.call(host, f'osd.{osd_id}', 'deploy',
                   ['--name', f'osd.{osd_id}', '--meta-json', mock.ANY,
-                   '--config-json', '-', '--osd-fsid', 'uuid'],
+                   '--config-json', '-', '--osd-fsid', 'uuid', '--objectstore', 'bluestore'],
                   stdin=mock.ANY, image=''),
         mock.call(host, 'osd', 'ceph-volume',
                   ['--', 'raw', 'list', '--format', 'json'], no_fsid=False, error_ok=False, image='', log_output=True),