proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-28 11:22:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ceph: remove obsolete ceph.service and do not distribute it anymore

Browse Source 
in nautilus there is no ceph-disk anymore and osd activation
does not use udev anymore so this service is not needed anymore

remove it and do not copy it when installing a new ceph cluster

in pve-storage.target we replace ceph.service with ceph.target

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-06-27 14:51:36 +02:00 committed by Thomas Lamprecht
parent cf06393a7a
commit 0b50996da5
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/CLI/pveceph.pm
View File

@ -129,20 +129,6 @@ __PACKAGE__->register_method ({
print "\ninstalled ceph $cephver successfully\n"; print "\ninstalled ceph $cephver successfully\n";
if (! -e '/etc/systemd/system/ceph.service') {
print "\nreplacing ceph init script with own ceph.service\n";
eval {
run_command('cp -v /usr/share/doc/pve-manager/examples/ceph.service /etc/systemd/system/ceph.service');
run_command('systemctl daemon-reload');
run_command('systemctl enable ceph.service');
};
if (my $err = $@) {
warn "WARNING: could not install ceph.service: $@\n";
} else {
print "installed ceph.service successfully\n";
}
}
return undef; return undef;
}}); }});

1
services/Makefile
View File

@ -31,7 +31,6 @@ install: ${SERVICES}
install -d ${SERVICEDIR}/ceph-mds@.service.d install -d ${SERVICEDIR}/ceph-mds@.service.d
install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d install -m 0644 ceph-after-pve-cluster.conf ${SERVICEDIR}/ceph-mds@.service.d
install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/ install -d ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/
install -m 0644 ceph.service ${DESTDIR}/usr/share/doc/${PACKAGE}/examples/ceph.service
.PHONY: clean .PHONY: clean
clean: clean:

11
services/ceph.service
View File

@ -1,11 +0,0 @@
[Unit]
Description=PVE activate Ceph OSD disks
After=pve-cluster.service
Requires=pve-cluster.service
[Service]
ExecStart=/usr/sbin/ceph-disk --log-stdout activate-all
Type=oneshot
[Install]
WantedBy=multi-user.target

2
services/pve-storage.target
View File

@ -2,7 +2,7 @@
Description=PVE Storage Target Description=PVE Storage Target
Wants=remote-fs.target Wants=remote-fs.target
After=remote-fs.target After=remote-fs.target
After=ceph.service After=ceph.target
After=ceph-mon.target After=ceph-mon.target
After=ceph-osd.target After=ceph-osd.target
After=ceph-mds.target After=ceph-mds.target