From a6f352e885f859edc003a6e3bf5814cf881d474a Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 2 Aug 2013 12:57:11 -0400 Subject: [PATCH] use the new which_service helper for all distros Signed-off-by: Alfredo Deza --- ceph_deploy/hosts/centos/mon/create.py | 4 ++-- ceph_deploy/hosts/debian/mon/create.py | 4 +++- ceph_deploy/hosts/fedora/mon/create.py | 3 ++- ceph_deploy/hosts/suse/mon/create.py | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ceph_deploy/hosts/centos/mon/create.py b/ceph_deploy/hosts/centos/mon/create.py index 4552ea4..20ec198 100644 --- 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 970d6b3..1a849c5 100644 --- 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 4552ea4..f8ff9ca 100644 --- 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 4552ea4..f8ff9ca 100644 --- 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) -- 2.47.3