RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 21:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55560 from tchaikov/systemd-sans-clsuter-name

Browse Source 
systemd: do not pass --cluster option

Reviewed-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
Kefu Chai 2024-05-08 21:40:36 +08:00 committed by GitHub
commit 628bc108b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
systemd/ceph-fuse@.service.in
View File

@ -6,9 +6,8 @@ Conflicts=umount.target
PartOf=ceph-fuse.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecStart=/usr/bin/ceph-fuse -f --cluster ${CLUSTER} %I
ExecStart=/usr/bin/ceph-fuse -f %I
LockPersonality=true
MemoryDenyWriteExecute=true
NoNewPrivileges=true

3
systemd/ceph-immutable-object-cache@.service.in
View File

@ -5,10 +5,9 @@ Wants=network-online.target local-fs.target
PartOf=ceph-immutable-object-cache.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/ceph-immutable-object-cache -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/ceph-immutable-object-cache -f --id %i --setuser ceph --setgroup ceph
LockPersonality=true
MemoryDenyWriteExecute=true
NoNewPrivileges=true

3
systemd/ceph-mds@.service.in
View File

@ -6,10 +6,9 @@ Before=remote-fs-pre.target ceph-mds.target
Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/ceph-mds -f --id %i --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

3
systemd/ceph-mgr@.service.in
View File

@ -6,10 +6,9 @@ Before=remote-fs-pre.target ceph-mgr.target
Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/ceph-mgr -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/ceph-mgr -f --id %i --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

3
systemd/ceph-mon@.service.in
View File

@ -10,10 +10,9 @@ Before=remote-fs-pre.target ceph-mon.target
Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/ceph-mon -f --id %i --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

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

@ -6,11 +6,10 @@ Before=remote-fs-pre.target ceph-osd.target
Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
ExecStart=/usr/bin/ceph-osd -f --id %i --setuser ceph --setgroup ceph
ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --id %i
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

3
systemd/ceph-radosgw@.service.in
View File

@ -6,9 +6,8 @@ Before=remote-fs-pre.target ceph-radosgw.target
Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecStart=/usr/bin/radosgw -f --cluster ${CLUSTER} --name client.%i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/radosgw -f --name client.%i --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

3
systemd/ceph-rbd-mirror@.service.in
View File

@ -5,10 +5,9 @@ Wants=network-online.target local-fs.target
PartOf=ceph-rbd-mirror.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/rbd-mirror -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
ExecStart=/usr/bin/rbd-mirror -f --id %i --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true

3
systemd/cephfs-mirror@.service.in
View File

@ -5,9 +5,8 @@ Wants=network-online.target local-fs.target
PartOf=cephfs-mirror.target
[Service]
Environment=CLUSTER=ceph
EnvironmentFile=-@SYSTEMD_ENV_FILE@
ExecStart=/usr/bin/cephfs-mirror --id %i --cluster ${CLUSTER} -f --setuser ceph --setgroup ceph
ExecStart=/usr/bin/cephfs-mirror --id %i -f --setuser ceph --setgroup ceph
LimitNOFILE=1048576
LimitNPROC=1048576
LockPersonality=true