systemd: no need to preprocess ceph-osd@service

This used to be necessary but now is not.

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

diff --git a/.gitignore b/.gitignore
index 557861a19335edeace34daccf5e5387443d22339..f6233f3e3e050586bc4674ca958bded3df348428 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ missing
 py-compile
 release
 stamp-h1
-systemd/ceph-osd@.service
 systemd/ceph-rgw.tmpfiles.d
 systemd/Makefile
 vgcore.*

diff --git a/configure.ac b/configure.ac
index 3ed736e7a7498b271f85c32694c8fa01e5f9edfa..58c0b6bc592a39347dad6b916e9463e19e57a7b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1342,7 +1342,6 @@ AC_CONFIG_FILES([Makefile
        man/Makefile
        doc/Makefile
        selinux/Makefile
-       systemd/ceph-osd@.service
        systemd/ceph-rgw.tmpfiles.d
        ceph.spec])
 AC_OUTPUT

diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service
new file mode 100644 (file)
index 0000000..1f7ccc4
--- /dev/null
+++ b/systemd/ceph-osd@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Ceph object storage daemon
+After=network-online.target local-fs.target
+Wants=network-online.target local-fs.target
+PartOf=ceph.target
+
+[Service]
+LimitNOFILE=1048576
+EnvironmentFile=-/etc/sysconfig/ceph
+Environment=CLUSTER=ceph
+ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
+ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=ceph.target

diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
deleted file mode 100644 (file)
index 1f7ccc4..0000000
--- a/systemd/ceph-osd@.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Ceph object storage daemon
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-LimitNOFILE=1048576
-EnvironmentFile=-/etc/sysconfig/ceph
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=ceph.target