systemd: reinstate missing Environment=CLUSTER=ceph

Commit b6eaf97 removed the Environment=CLUSTER=ceph lines from the
systemd service files.  This has the unfortunate side effect of causing
the daemons to not start at all unless /etc/sysconfig/ceph exists and
sets the CLUSTER variable.

Signed-off-by: Tim Serong <tserong@suse.com>

diff --git a/systemd/ceph-mds@.service b/systemd/ceph-mds@.service
index 536d14b86d90659da00fd7ced8ab3a92c5153df6..22a787d60b4156f7f3f25ce99baf48fa0144b7fb 100644 (file)
--- a/systemd/ceph-mds@.service
+++ b/systemd/ceph-mds@.service
@@ -6,6 +6,7 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
+Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
 
 [Install]

diff --git a/systemd/ceph-mon@.service b/systemd/ceph-mon@.service
index 19436c213a7a4bcd1fe4746eb575bc5ca82542a3..437ef4d21b4d2a5382d6bf53f28e13760042606c 100644 (file)
--- a/systemd/ceph-mon@.service
+++ b/systemd/ceph-mon@.service
@@ -11,6 +11,7 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
+Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
 
 [Install]

diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service
index 9aa5b38fa2dcd5458ec30e72afe0d81e126c3726..09f51c5938bf5b5163df7193e780a7eff7358639 100644 (file)
--- a/systemd/ceph-osd@.service
+++ b/systemd/ceph-osd@.service
@@ -6,6 +6,7 @@ PartOf=ceph.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
+Environment=CLUSTER=ceph
 ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
 ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
 LimitNOFILE=131072