]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
src/init-ceph.in:Remove ceph-create-keys for sysv
authorOwen Synge <osynge@suse.com>
Tue, 10 May 2016 08:59:12 +0000 (10:59 +0200)
committerOwen Synge <osynge@suse.com>
Fri, 4 Nov 2016 22:05:52 +0000 (23:05 +0100)
ceph-create-keys should not be started on boot of mons with sysv init.

Signed-off-by: Owen Synge <osynge@suse.com>
src/init-ceph.in

index e58481a9ff0f0ec9cb5581e028607499b32a62d3..54061a8a2a893ccf7e58e14dbff0195d3b30214d 100755 (executable)
@@ -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
            ;;