RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5086 from SUSE/wip-12173

Browse Source 
logrotate.conf: fixes for systemd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
This commit is contained in:
Ken Dreyer 2015-06-26 11:49:55 -06:00
commit 909301917e
6 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceph.spec.in
View File

@ -43,6 +43,7 @@ Requires: python-cephfs = %{epoch}:%{version}-%{release}
Requires: python
Requires: python-requests
Requires: python-flask
Requires: grep
Requires: xfsprogs
Requires: parted
Requires: util-linux

1
debian/control vendored
View File

@ -64,6 +64,7 @@ Depends: binutils,
ceph-common (>= 9.0.0-943),
cryptsetup-bin | cryptsetup,
gdisk,
grep,
parted,
python,
python-argparse,

4
src/logrotate.conf
View File

@ -8,6 +8,10 @@
service ceph reload >/dev/null
elif which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
invoke-rc.d ceph reload >/dev/null
elif which systemctl > /dev/null 2>&1 && [ -x `which systemctl` ]; then
if systemctl is-active 'ceph-*' | grep -i active > /dev/null 2>&1 ; then
systemctl reload 'ceph-*' >/dev/null || :
fi
fi
# Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then

1
systemd/ceph-mds@.service
View File

@ -8,6 +8,7 @@ PartOf=ceph.target
EnvironmentFile=-/etc/sysconfig/ceph
Environment=CLUSTER=ceph
ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=ceph.target

1
systemd/ceph-mon@.service
View File

@ -15,6 +15,7 @@ PartOf=ceph.target
EnvironmentFile=-/etc/sysconfig/ceph
Environment=CLUSTER=ceph
ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=ceph.target

1
systemd/ceph-osd@.service.in
View File

@ -10,6 +10,7 @@ Environment=CLUSTER=ceph
ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
ExecStartPre=@systemd_libexec_dir@/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
LimitNOFILE=131072
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=ceph.target