From: Owen Synge <osynge@suse.com>
Date: Tue, 10 May 2016 08:59:12 +0000 (+0200)
Subject: src/init-ceph.in:Remove ceph-create-keys for sysv
X-Git-Tag: v11.1.0~408^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc441cbd6e146e22b84224f1e53753b780151f01;p=ceph.git

src/init-ceph.in:Remove ceph-create-keys for sysv

ceph-create-keys should not be started on boot of mons with sysv init.

Signed-off-by: Owen Synge <osynge@suse.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index e58481a9ff0f..54061a8a2a89 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -436,22 +436,6 @@ for name in $what; do
 		continue
 	    fi
 
-	    if [ "$type" = "mon" ]; then
-		# this will only work if we are using default paths
-		# for the mon data and admin socket.  if so, run
-		# ceph-create-keys.  this is the case for (normal)
-		# chef and ceph-deploy clusters, which is who needs
-		# these keys.  it's also true for legacy installs
-		# via mkcephfs, which is fine too; there is no harm
-		# in creating these keys.
-		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
-		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
-		    echo Starting ceph-create-keys on $host...
-		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
-		    do_cmd "$cmd2"
-		fi
-	    fi
-
 	    [ -n "$post_start" ] && do_cmd "$post_start"
 	    [ -n "$lockfile" ] && [ "$?" -eq 0 ] && touch $lockfile
 	    ;;