From: Tim Serong <tserong@suse.com>
Date: Thu, 7 May 2015 00:05:52 +0000 (+1000)
Subject: systemd: reinstate missing Environment=CLUSTER=ceph
X-Git-Tag: SES1-maint01~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7b9a564a495b44d8da2841d9c8a8013058a3f89;p=ceph.git

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 536d14b86d90..22a787d60b41 100644
--- 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 19436c213a7a..437ef4d21b4d 100644
--- 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 9aa5b38fa2dc..09f51c5938bf 100644
--- 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