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 <tchaikov@gmail.com>

diff --git a/systemd/ceph-fuse@.service.in b/systemd/ceph-fuse@.service.in
index 9c12c9ba4446690a122eff36cb8b34b0e4fecec7..0bde59a09c3530bef44199967dbe7490b2615065 100644 (file)
--- 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 62ff8dbd2729e1f3a0373ff5ceb554fd6085dace..827444ba7da2c723b4d2ed177ee40142ab6e3444 100644 (file)
--- 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 afa36702f9c0ab0257b7dbdfb161bd2b770d8713..628b402af9d0a910c7c8a64da7af5022c2eb4db4 100644 (file)
--- 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 8fadc4746b3ad18c2c7082e3a4cb5f2159c19617..0c89b6f85ec81ac407e090566497461a6ea94b5d 100644 (file)
--- 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 2eba83c3cc9bcc5dcfeefd8bc2491a0b13574b58..26626f465aa2dc37524b470cf89b0b1099b13351 100644 (file)
--- 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 046500efb66b27d9d1af52b27e5cdca0bec50a28..eb67c21e047c0404f0b3ce1ae63f1becef361576 100644 (file)
--- 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 b74747055065282bd2740da2c4afebc60c40d275..a2d28c6ca6cd13520166a463e19b5845b1abb5c2 100644 (file)
--- 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 1057892dc99c25e45411cdf651d3c5e862979c35..d95b4288e947284f0fbc2562e282eab6dbc28aa0 100644 (file)
--- 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 bed9d195302ba14c6efaa019ddc34c0637486d62..9f83c1d9c3d6ea61b8134326fe08bc0a08a0aa57 100644 (file)
--- 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