From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jul 2015 19:44:15 +0000 (-0400)
Subject: systemd: fix ceph-radosgw@ service
X-Git-Tag: v9.1.0~439^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d10dc134b817160bab6aecb9f5c08fb2d4f08e6;p=ceph.git

systemd: fix ceph-radosgw@ service

There's no prestart.  Fix the instance name.  Cleanup.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/systemd/ceph-radosgw@.service b/systemd/ceph-radosgw@.service
index f0c24e32d4fd..8a520aca30d6 100644
--- a/systemd/ceph-radosgw@.service
+++ b/systemd/ceph-radosgw@.service
@@ -7,9 +7,7 @@ PartOf=ceph.target
 [Service]
 EnvironmentFile=-/etc/sysconfig/ceph
 Environment=CLUSTER=ceph
-ExecStart=/usr/bin/radosgw -f --conf /etc/ceph/${CLUSTER}.conf --name client.radosgw.%i
-ExecStartPre=/usr/lib/ceph-radosgw/ceph-radosgw-prestart.sh --cluster ${CLUSTER} --name %i
-User=wwwrun
+ExecStart=/usr/bin/radosgw -f --cluster ${CLUSTER} --name client.%i
 
 [Install]
 WantedBy=ceph.target