From: Sage Weil <sage@redhat.com>
Date: Thu, 24 Oct 2019 00:46:06 +0000 (-0500)
Subject: Merge PR #31094 into master
X-Git-Tag: v15.1.0~1179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf09a04d2275de2143feeb63f5e125396c7d4a72;p=ceph.git

Merge PR #31094 into master

* refs/pull/31094/head:
	ceph-daemon: remove redundant --privileged
	test_ceph_daemon: test unit, enter, shell
	ceph-daemon: drop exec
	ceph-daemon: fix exit code for run, shell, enter, exec
	ceph-daemon: allow optional command for 'enter'
	ceph-daemon: fix LANG for 'enter' command
	ceph-daemon: allow shell to take optional command
	qa/suites/rados/singleton-nomsgr/ceph-daemon: run test_ceph_daemon.sh
	qa/standalone/test_ceph_daemon.sh: add new functional tests
	test_ceph_daemon.sh: use newer image
	ceph-daemon: unconditionally enable and start crash unit
	ceph-daemon: fix crash unit cleanup
	ceph-daemon: include 'crash' unit/item in 'ls' output
	ceph-daemon: fix 'ls'
	mgr/orchestrator: s/sdd/ssd/
	mgr/ssh: remove stdout/stderr kludges
	ceph-daemon: fix ceph-volume command to write stdout to stdout

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

bf09a04d2275de2143feeb63f5e125396c7d4a72
diff --cc src/ceph-daemon
index 486d978e9ef6,3e380901e97c..2fa8647b97d2
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@@ -585,10 -558,10 +584,9 @@@ def deploy_crash(fsid, uid, gid, config
          )
          os.rename(os.path.join(args.unit_dir, unit_name + '.new'),
                    os.path.join(args.unit_dir, unit_name))
-     if not existed:
-         subprocess.check_output(['systemctl', 'enable', unit_name])
-         subprocess.check_output(['systemctl', 'start', unit_name])
+     subprocess.check_output(['systemctl', 'enable', unit_name])
+     subprocess.check_output(['systemctl', 'start', unit_name])
  
 -
  def get_unit_file(fsid):
      u = """[Unit]
  Description=Ceph daemon for {fsid}