summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authoranand <anekkunt@redhat.com>2015-09-15 12:05:51 +0530
committerAtin Mukherjee <amukherj@redhat.com>2015-10-14 22:38:01 -0700
commit8629457bfc0347b0ad459ed0ce69a5f35c1314c7 (patch)
treec347666eddce150be93b6561066b1fe5f9a2224e /extras
parent1722aabf0caa9059a38525ff71626df157187868 (diff)
systemd/spec/glusterd: Adding EnvironmentFile in glusterd systemctrl service file.
Issue: glusterd was not running in debug mode, this is because of "systemctrl start glusterd" was not reading configuration from glusterd-sysconfig file. Fix: Set glusterd-sysconfig file as "EnvironmentFile" and pass args to glusterd. Backport of: >Change-Id: I6a032a2e86e5a25c39199ddf953bfbd6590d53b6 >BUG: 1263087 >Signed-off-by: anand <anekkunt@redhat.com> >Reviewed-on: http://review.gluster.org/12175 >Reviewed-by: Anoop C S <anoopcs@redhat.com> >Reviewed-by: Niels de Vos <ndevos@redhat.com> >Tested-by: NetBSD Build System <jenkins@build.gluster.org> >Tested-by: Gluster Build System <jenkins@build.gluster.com> >(cherry picked from commit 63e3806ba3c4d5f196ad2254f63d85b79602705a) Change-Id: Ib081a2a4bcfbfc1fe4334da1ec8c1dbab0760657 BUG: 1271540 Signed-off-by: anand <anekkunt@redhat.com> Reviewed-on: http://review.gluster.org/12358 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/systemd/glusterd.service.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in
index a5d260d..5f962a6 100644
--- a/extras/systemd/glusterd.service.in
+++ b/extras/systemd/glusterd.service.in
@@ -7,7 +7,9 @@ Before=network-online.target
Type=forking
PIDFile=@localstatedir@/run/glusterd.pid
LimitNOFILE=65536
-ExecStart=@prefix@/sbin/glusterd -p @localstatedir@/run/glusterd.pid
+Environment="LOG_LEVEL=INFO"
+EnvironmentFile=-@sysconfdir@/sysconfig/glusterd
+ExecStart=@prefix@/sbin/glusterd -p @localstatedir@/run/glusterd.pid --log-level $LOG_LEVEL $GLUSTERD_OPTIONS
KillMode=process
[Install]