Skip to content

Commit

Permalink
Merge pull request #55560 from tchaikov/systemd-sans-clsuter-name
Browse files Browse the repository at this point in the history 
systemd: do not pass --cluster option

Reviewed-by: John Mulligan <[email protected]>
  • Loading branch information
@tchaikov
tchaikov authored May 8, 2024
2 parents af30430 + 5659920 commit 628bc10
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 19 deletions.
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions systemd/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 628bc10

Please sign in to comment.