From c6545b194fb752b3d699d6dab9211864ce7e1c10 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 Sep 2019 17:00:13 -0500 Subject: [PATCH] ceph-daemon: bind config to default location This is one less thing on the command line, and an easier time when inside the container. Signed-off-by: Sage Weil --- src/ceph-daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-daemon b/src/ceph-daemon index 33ef14a4894..7e1b14e0214 100755 --- a/src/ceph-daemon +++ b/src/ceph-daemon @@ -148,6 +148,7 @@ def get_container(fsid, daemon_type, daemon_id): mounts = { log_dir: '/var/log/ceph:z', data_dir: cdata_dir + ':z', + data_dir + '/config': '/etc/ceph/ceph.conf:z', } if daemon_type in ['mon', 'osd']: mounts['/run/udev'] = '/run/udev:z' @@ -159,7 +160,6 @@ def get_container(fsid, daemon_type, daemon_id): image=args.image, entrypoint='ceph-' + daemon_type, args=['-i', daemon_id, - '-c', cdata_dir + '/config', '-f', # foreground ] + extra_args + get_daemon_args(fsid, daemon_type, daemon_id), volume_mounts=mounts, -- 2.39.5