From: Sage Weil <sage@redhat.com>
Date: Fri, 25 Oct 2019 19:30:33 +0000 (-0500)
Subject: Merge PR #31141 into master
X-Git-Tag: v15.1.0~1158
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0bc2ed6191b89a34973b0874440388f7162fc3f4;p=ceph.git

Merge PR #31141 into master

* refs/pull/31141/head:
	ceph-daemon: fix warning message
	ceph-daemon: fix enable with conflicting ceph.target files
	test_ceph_daemon.sh: use same fsid as qa/standalone/test_ceph_daemon.sh
	test_ceph_daemon.sh: use other latest-master image
	ceph-daemon: fix pathify (fix shell --config/--keyring)
	ceph-daemon: /var/run/ceph -> /var/run/ceph/$fsid

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

0bc2ed6191b89a34973b0874440388f7162fc3f4
diff --cc src/ceph-daemon
index c7bfcd55f65a,3ae8d8feb816..6dfc456c0047
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@@ -337,11 -333,10 +333,12 @@@ def get_config_and_both_keyrings()
  def get_container_mounts(fsid, daemon_type, daemon_id):
      mounts = {}
      if fsid:
+         mounts['/var/run/ceph/%s' % fsid] = '/var/run/ceph:z'
          log_dir = get_log_dir(fsid)
          mounts[log_dir] = '/var/log/ceph:z'
 -        mounts['/var/lib/ceph/%s/crash' % fsid] = '/var/lib/ceph/crash:z'
 +        crash_dir = '/var/lib/ceph/%s/crash' % fsid
 +        if os.path.exists(crash_dir):
 +            mounts[crash_dir] = '/var/lib/ceph/crash:z'
  
      if daemon_id:
          data_dir = get_data_dir(fsid, daemon_type, daemon_id)