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 <sage@redhat.com>

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 33ef14a489455a6911cb1d8a4b87535b6b74cda1..7e1b14e02145dae5304327aa523bc37ed01fadc8 100755 (executable)
--- 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,