From fc01473e55c3fa5b4f5d2049d2333dfa7cad7449 Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Wed, 12 Apr 2017 14:02:26 +0200 Subject: [PATCH] ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts - rc.d/ceph does not really like the extra stop/start as las cmd. - And make Start and Stop look similar. Signed-off-by: Willem Jan Withagen --- src/ceph-disk/ceph_disk/main.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index 396d641b6d1..390f579a627 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -3234,14 +3234,10 @@ def start_daemon( ], ) elif os.path.exists(os.path.join(path, 'bsdrc')): - base_script = '/usr/local/etc/rc.d/ceph' - osd_script = '{base} start osd.{osd_id}'.format( - base=base_script, - osd_id=osd_id - ) command_check_call( [ - osd_script, + '/usr/local/etc/rc.d/ceph start osd.{osd_id}' + .format(osd_id=osd_id), ], ) else: @@ -3315,7 +3311,6 @@ def stop_daemon( [ '/usr/local/etc/rc.d/ceph stop osd.{osd_id}' .format(osd_id=osd_id), - 'stop', ], ) else: -- 2.39.5