From: Alfredo Deza <alfredo@deza.pe>
Date: Fri, 9 Aug 2013 22:25:12 +0000 (-0700)
Subject: use the right init script in mon create
X-Git-Tag: v1.2~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d2d9881f93df6383d99720c84d6e7397a04bba0;p=ceph-deploy.git

use the right init script in mon create

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

diff --git a/ceph_deploy/hosts/common.py b/ceph_deploy/hosts/common.py
index b7764a8..f5e3b8a 100644
--- a/ceph_deploy/hosts/common.py
+++ b/ceph_deploy/hosts/common.py
@@ -31,7 +31,12 @@ def mon_create(distro, logger, args, monitor_keyring, hostname):
     logger.debug('remote hostname: %s' % hostname)
     path = paths.mon.path(args.cluster, hostname)
     done_path = paths.mon.done(args.cluster, hostname)
-    init_path = paths.mon.init(args.cluster, hostname, 'sysvinit')
+    if distro.name.lower() == 'ubuntu':
+        init = 'upstart'
+    else:
+        init = 'sysvinit'
+
+    init_path = paths.mon.init(args.cluster, hostname, init)
 
     configuration = conf.load(args)
     conf_data = StringIO()