Merge pull request #9345 from SUSE/wip_remove_mon_startup_magic

mon: remove ceph-create-keys from mon startup

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

ceph.spec.in

@@ -809,7 +809,6 @@ rm -rf %{buildroot}
 %{_bindir}/osdmaptool
 %{_bindir}/ceph-run
 %{_bindir}/ceph-detect-init
-%{_unitdir}/ceph-create-keys@.service
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph

debian/rules

@@ -55,7 +55,6 @@ override_dh_installinit:
 	# per package, so do this ourselves
 	install -d -m0755 debian/ceph-base/etc/init
 	install -m0644 src/upstart/ceph-all.conf debian/ceph-base/etc/init
-	install -m0644 src/upstart/ceph-create-keys.conf debian/ceph-base/etc/init
 	install -d -m0755 debian/ceph-osd/etc/init
 	install -m0644 src/upstart/ceph-osd*.conf debian/ceph-osd/etc/init
 	install -m0644 src/upstart/ceph-disk.conf debian/ceph-osd/etc/init
@@ -83,12 +82,10 @@ override_dh_installinit:
 	install -d -m0755 debian/ceph-mon/lib/systemd/system
 	install -d -m0755 debian/ceph-osd/lib/systemd/system
 	install -m0644 systemd/ceph-mon@.service debian/ceph-mon/lib/systemd/system
-	install -m0644 systemd/ceph-create-keys@.service debian/ceph-base/lib/systemd/system
 	install -m0644 systemd/ceph-osd@.service debian/ceph-osd/lib/systemd/system
 	install -m0644 systemd/ceph-disk@.service debian/ceph-osd/lib/systemd/system
 	install -m0644 systemd/rbdmap.service debian/ceph-common/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mon/lib/systemd/system/ceph-mon@.service
-	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-base/lib/systemd/system/ceph-create-keys@.service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-osd@.service
 	sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-osd/lib/systemd/system/ceph-disk@.service
 	install -m0644 systemd/ceph-mon.target debian/ceph-mon/lib/systemd/system

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
 	    ;;

systemd/CMakeLists.txt

@@ -9,7 +9,6 @@ install(FILES
   ceph-mds@.service
   ceph-mgr@.service
   ceph-mon@.service
-  ceph-create-keys@.service
   ceph-osd@.service
   ceph-radosgw@.service
   ceph-rbd-mirror@.service

systemd/ceph-mon@.service

@@ -5,8 +5,8 @@ Description=Ceph cluster monitor daemon
 #   http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
 # these can be removed once ceph-mon will dynamically change network
 # configuration.
-After=network-online.target local-fs.target time-sync.target ceph-create-keys@%i.service
-Wants=network-online.target local-fs.target time-sync.target ceph-create-keys@%i.service ceph-mgr@%i.service
+After=network-online.target local-fs.target time-sync.target
+Wants=network-online.target local-fs.target time-sync.target ceph-mgr@%i.service
 
 PartOf=ceph-mon.target