Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon: remove ceph-create-keys from mon startup #9345

Merged
merged 7 commits into from
Nov 4, 2016
Merged

mon: remove ceph-create-keys from mon startup #9345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2dd25f
ceph.spec.in:Remove ceph-create-keys for systemd
oms4suse May 10, 2016
d5af77f
debian/rules:Remove ceph-create-keys for deb packaging
oms4suse May 10, 2016
4e27f27
src/upstart/ceph-create-keys.conf:Remove ceph-create-keys for upstart
oms4suse May 10, 2016
8bcb464
systemd/ceph-create-keys@.service:Remove ceph-create-keys for systemd
oms4suse May 10, 2016
dc5fe8d
systemd/ceph-mon@.service:Remove ceph-create-keys for mon in systemd
oms4suse May 25, 2016
639385a
systemd/CMakeLists.txt:Remove ceph-create-keys cmake
oms4suse Sep 12, 2016
cc441cb
src/init-ceph.in:Remove ceph-create-keys for sysv
oms4suse May 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion ceph.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions src/init-ceph.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down
8 changes: 0 additions & 8 deletions src/upstart/ceph-create-keys.conf
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion systemd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions systemd/ceph-create-keys@.service
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions systemd/ceph-mon@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down