]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts 14476/head
authorWillem Jan Withagen <wjw@digiware.nl>
Wed, 12 Apr 2017 12:02:26 +0000 (14:02 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Wed, 12 Apr 2017 12:02:26 +0000 (14:02 +0200)
 - 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 <wjw@digiware.nl>
src/ceph-disk/ceph_disk/main.py

index 396d641b6d128160cf4ca9ba9b2d3ec54d401f10..390f579a62788c862f8624ecfcc956d8ab752412 100755 (executable)
@@ -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: