use the new which_service helper for all distros

Signed-off-by: Alfredo Deza <alfredo@deza.pe>

diff --git a/ceph_deploy/hosts/centos/mon/create.py b/ceph_deploy/hosts/centos/mon/create.py
index 4552ea4a4a6ad994dc9c4afa0d3e795a411099db..20ec198e0086f96ac697e71efb92917c388fc1d7 100644 (file)
--- a/ceph_deploy/hosts/centos/mon/create.py
+++ b/ceph_deploy/hosts/centos/mon/create.py
@@ -5,12 +5,12 @@ from ceph_deploy.hosts import common
 def create(distro, logger, args, monitor_keyring):
     hostname = distro.sudo_conn.modules.socket.gethostname().split('.')[0]
     common.mon_create(distro, logger, args, monitor_keyring, hostname)
-
+    service = common.which_service(distro.sudo_conn, logger)
     check_call(
         distro.sudo_conn,
         logger,
         [
-            '/sbin/service',
+            service,
             'ceph',
             'start',
             'mon.{hostname}'.format(hostname=hostname)

diff --git a/ceph_deploy/hosts/debian/mon/create.py b/ceph_deploy/hosts/debian/mon/create.py
index 970d6b3cbb0b2e185c2db48dceb43ecb40a6f4f5..1a849c556b9f94c697c252f1714aace946527d51 100644 (file)
--- a/ceph_deploy/hosts/debian/mon/create.py
+++ b/ceph_deploy/hosts/debian/mon/create.py
@@ -20,11 +20,13 @@ def create(distro, logger, args, monitor_keyring):
         )
 
     else:  # Debian doesn't use initctl
+        service = common.which_service(distro.sudo_conn, logger)
+
         check_call(
             distro.sudo_conn,
             logger,
             [
-                '/sbin/service',
+                service,
                 'ceph',
                 'start',
                 'mon.{hostname}'.format(hostname=hostname)

diff --git a/ceph_deploy/hosts/fedora/mon/create.py b/ceph_deploy/hosts/fedora/mon/create.py
index 4552ea4a4a6ad994dc9c4afa0d3e795a411099db..f8ff9ca842f991b1be78cfc6bc8416b38873a55e 100644 (file)
--- a/ceph_deploy/hosts/fedora/mon/create.py
+++ b/ceph_deploy/hosts/fedora/mon/create.py
@@ -5,12 +5,13 @@ from ceph_deploy.hosts import common
 def create(distro, logger, args, monitor_keyring):
     hostname = distro.sudo_conn.modules.socket.gethostname().split('.')[0]
     common.mon_create(distro, logger, args, monitor_keyring, hostname)
+    service = common.which_service(distro.sudo_conn, logger)
 
     check_call(
         distro.sudo_conn,
         logger,
         [
-            '/sbin/service',
+            service,
             'ceph',
             'start',
             'mon.{hostname}'.format(hostname=hostname)

diff --git a/ceph_deploy/hosts/suse/mon/create.py b/ceph_deploy/hosts/suse/mon/create.py
index 4552ea4a4a6ad994dc9c4afa0d3e795a411099db..f8ff9ca842f991b1be78cfc6bc8416b38873a55e 100644 (file)
--- a/ceph_deploy/hosts/suse/mon/create.py
+++ b/ceph_deploy/hosts/suse/mon/create.py
@@ -5,12 +5,13 @@ from ceph_deploy.hosts import common
 def create(distro, logger, args, monitor_keyring):
     hostname = distro.sudo_conn.modules.socket.gethostname().split('.')[0]
     common.mon_create(distro, logger, args, monitor_keyring, hostname)
+    service = common.which_service(distro.sudo_conn, logger)
 
     check_call(
         distro.sudo_conn,
         logger,
         [
-            '/sbin/service',
+            service,
             'ceph',
             'start',
             'mon.{hostname}'.format(hostname=hostname)