From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 3 Nov 2015 18:46:05 +0000 (-0500)
Subject: [rhcs-v1.5.27-stable] [BZ-1231203] specify a pid location for monitors
X-Git-Tag: v1.5.27.3~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ab2dd771021a7faa8db8378061416d7bd2b880f;p=ceph-deploy.git

[rhcs-v1.5.27-stable] [BZ-1231203] specify a pid location for monitors

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph_deploy/hosts/common.py b/ceph_deploy/hosts/common.py
index 26cc186..489f93f 100644
--- a/ceph_deploy/hosts/common.py
+++ b/ceph_deploy/hosts/common.py
@@ -55,6 +55,7 @@ def mon_create(distro, args, monitor_keyring, hostname):
             user_args = user_args + [ '--setuser', str(uid) ]
         if gid != 0:
             user_args = user_args + [ '--setgroup', str(gid) ]
+
         remoto.process.run(
             distro.conn,
             [
@@ -133,6 +134,7 @@ def mon_add(distro, args, monitor_keyring):
             user_args = user_args + [ '--setuser', str(uid) ]
         if gid != 0:
             user_args = user_args + [ '--setgroup', str(gid) ]
+
         remoto.process.run(
             distro.conn,
             [
@@ -156,12 +158,14 @@ def mon_add(distro, args, monitor_keyring):
     distro.conn.remote_module.create_init_path(init_path, uid, gid)
 
     # start the mon using the address
+    pid_location = "/var/run/ceph/mon.%s.pid" % hostname
     remoto.process.run(
         distro.conn,
         [
             'ceph-mon',
             '-i',
             hostname,
+            '--pid-file', pid_location,
             '--public-addr',
             args.address,
         ],