Skip to content

Commit

Permalink
ceph.spec: ship ceph-disk-* units
Browse files Browse the repository at this point in the history
Signed-off-by: Sage Weil <[email protected]>
  • Loading branch information
liewegas committed Aug 1, 2015
1 parent 85a8946 commit e034c2a
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,9 @@ install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
install -m 0644 -D systemd/[email protected] $RPM_BUILD_ROOT%{_unitdir}/[email protected]
install -m 0644 -D systemd/[email protected] $RPM_BUILD_ROOT%{_unitdir}/[email protected]
install -m 0644 -D systemd/ceph.target $RPM_BUILD_ROOT%{_unitdir}/ceph.target
install -m 0644 -D systemd/[email protected] $RPM_BUILD_ROOT%{_unitdir}/[email protected]
install -m 0644 -D systemd/[email protected] $RPM_BUILD_ROOT%{_unitdir}/[email protected]
install -m 0644 -D systemd/[email protected] $RPM_BUILD_ROOT%{_unitdir}/[email protected]
%else
install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
Expand Down Expand Up @@ -638,7 +641,7 @@ mkdir -p %{_localstatedir}/run/ceph/
# /etc/systemd/system. May as well stop them too for completeness
# (although strictly service_del_preun would do that anyway by dint
# of stopping ceph.target)
SERVICE_LIST=$(systemctl | grep -E '^ceph-mon@|^ceph-create-keys@|^ceph-osd@|^ceph-mds@' | cut -d' ' -f1)
SERVICE_LIST=$(systemctl | grep -E '^ceph-mon@|^ceph-create-keys@|^ceph-osd@|^ceph-mds@|^ceph-disk-' | cut -d' ' -f1)
if [ -n "$SERVICE_LIST" ]; then
for SERVICE in $SERVICE_LIST; do
/usr/bin/systemctl --no-reload disable $SERVICE > /dev/null 2>&1 || :
Expand Down Expand Up @@ -700,6 +703,9 @@ mkdir -p %{_localstatedir}/run/ceph/
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
%{_unitdir}/[email protected]
%{_unitdir}/ceph.target
%else
%{_initrddir}/ceph
Expand Down

0 comments on commit e034c2a

Please sign in to comment.