]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #31094 into master
authorSage Weil <sage@redhat.com>
Thu, 24 Oct 2019 00:46:06 +0000 (19:46 -0500)
committerSage Weil <sage@redhat.com>
Thu, 24 Oct 2019 00:46:06 +0000 (19:46 -0500)
* 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>
1  2 
src/ceph-daemon

diff --cc src/ceph-daemon
index 486d978e9ef69a1b6ba4c5a84d7f7eb411288ae8,3e380901e97c4cf68b2d3403999b6ec43f0219f5..2fa8647b97d20bf791b55e094879ef48fe294f3d
@@@ -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}