From 5659920c7c128cb8d9552580dbe23dd167a56c31 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 13 Feb 2024 15:00:58 +0800 Subject: [PATCH] systemd: do not pass --cluster option we do not encourage user to run multiple cluster using different cluster name since 8fe460e7562b28e007179eeb533ef68a3e99b4c8, and the recommended way is to use cephadm. see also https://docs.ceph.com/en/latest/rados/configuration/common/#naming-clusters-deprecated, so let's stop passing `--cluster` in systemd service units. there are more places where we are still feeding this optoin to command line tools or services. we should do the cleanup piecemeal to reduce the potential risk. FWIW, if not specified, the cluster name is "ceph" by default. Signed-off-by: Kefu Chai --- systemd/ceph-fuse@.service.in | 3 +-- systemd/ceph-immutable-object-cache@.service.in | 3 +-- systemd/ceph-mds@.service.in | 3 +-- systemd/ceph-mgr@.service.in | 3 +-- systemd/ceph-mon@.service.in | 3 +-- systemd/ceph-osd@.service.in | 5 ++--- systemd/ceph-radosgw@.service.in | 3 +-- systemd/ceph-rbd-mirror@.service.in | 3 +-- systemd/cephfs-mirror@.service.in | 3 +-- 9 files changed, 10 insertions(+), 19 deletions(-) diff --git a/systemd/ceph-fuse@.service.in b/systemd/ceph-fuse@.service.in index 9c12c9ba444..0bde59a09c3 100644 --- a/systemd/ceph-fuse@.service.in +++ b/systemd/ceph-fuse@.service.in @@ -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 diff --git a/systemd/ceph-immutable-object-cache@.service.in b/systemd/ceph-immutable-object-cache@.service.in index 62ff8dbd272..827444ba7da 100644 --- a/systemd/ceph-immutable-object-cache@.service.in +++ b/systemd/ceph-immutable-object-cache@.service.in @@ -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 diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in index afa36702f9c..628b402af9d 100644 --- a/systemd/ceph-mds@.service.in +++ b/systemd/ceph-mds@.service.in @@ -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 diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in index 8fadc4746b3..0c89b6f85ec 100644 --- a/systemd/ceph-mgr@.service.in +++ b/systemd/ceph-mgr@.service.in @@ -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 diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in index 2eba83c3cc9..26626f465aa 100644 --- a/systemd/ceph-mon@.service.in +++ b/systemd/ceph-mon@.service.in @@ -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 diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in index 046500efb66..eb67c21e047 100644 --- a/systemd/ceph-osd@.service.in +++ b/systemd/ceph-osd@.service.in @@ -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 diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in index b7474705506..a2d28c6ca6c 100644 --- a/systemd/ceph-radosgw@.service.in +++ b/systemd/ceph-radosgw@.service.in @@ -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 diff --git a/systemd/ceph-rbd-mirror@.service.in b/systemd/ceph-rbd-mirror@.service.in index 1057892dc99..d95b4288e94 100644 --- a/systemd/ceph-rbd-mirror@.service.in +++ b/systemd/ceph-rbd-mirror@.service.in @@ -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 diff --git a/systemd/cephfs-mirror@.service.in b/systemd/cephfs-mirror@.service.in index bed9d195302..9f83c1d9c3d 100644 --- a/systemd/cephfs-mirror@.service.in +++ b/systemd/cephfs-mirror@.service.in @@ -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