systemd: eliminate ceph-rgw tmpfiles.d file

This is for storing the rgw socket files for fastcgi, which we do not
want to enable by default.

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

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 45fc06eadc204d5be38b96dcec81ceece15bd946..c068af6a4268c82739507bee131503a8fa4ae4aa 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -595,7 +595,6 @@ install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
 install -m 0644 -D etc/sysconfig/ceph $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ceph
 %if 0%{?_with_systemd}
   install -m 0644 -D systemd/ceph.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
-  install -m 0644 -D systemd/ceph-rgw.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}-rgw.conf
   install -m 0644 -D systemd/ceph-osd@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-osd@.service
   install -m 0644 -D systemd/ceph-mon@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-mon@.service
   install -m 0644 -D systemd/ceph-create-keys@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-create-keys@.service
@@ -916,7 +915,6 @@ fi
 %dir %{_localstatedir}/log/radosgw/
 %dir %{_localstatedir}/lib/ceph/radosgw
 %if 0%{?_with_systemd}
-%{_tmpfilesdir}/%{name}-rgw.conf
 %else
 %{_initrddir}/ceph-radosgw
 %{_sbindir}/rcceph-radosgw
@@ -925,8 +923,6 @@ fi
 %post radosgw
 /sbin/ldconfig
 %if 0%{?suse_version}
-  # TODO: find out what exactly this systemd-tmpfiles inovcation is for
-  systemd-tmpfiles --create /%{_tmpfilesdir}/ceph-rgw.conf
   # explicit systemctl daemon-reload (that's the only relevant bit of
   # service_add_post; the rest is all sysvinit --> systemd migration which
   # isn't applicable in this context (see above comment).

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

diff --git a/debian/rules b/debian/rules
index c81036a471951b1774cc2005823be0ba0266946c..95fdfbd4545247ab837f0c796795e923b47cf90d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -153,8 +153,6 @@ binary-arch: build install
        install -d -m0755 debian/radosgw/lib/systemd/system
        install -m0644 systemd/ceph-radosgw@.service debian/radosgw/lib/systemd/system
        sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw@.service
-       install -d -m0755 debian/radosgw/usr/lib/tmpfiles.d
-       install -m 0644 -D systemd/ceph-rgw.tmpfiles.d debian/radosgw/usr/lib/tmpfiles.d/ceph-rgw.conf
 
        dh_installman -a
        dh_lintian -a

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 3db6c85f5d8afa6702326e7733ee9ff38f99ad9d..b7fde384c83d1370acd7cb4b6a5d633d0674aead 100644 (file)
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -15,5 +15,4 @@ EXTRA_DIST = \
        $(unitfiles) \
        ceph \
        ceph.tmpfiles.d \
-       ceph-rgw.tmpfiles.d.in \
        ceph-radosgw-prestart.sh

diff --git a/systemd/ceph-rgw.tmpfiles.d.in b/systemd/ceph-rgw.tmpfiles.d.in
deleted file mode 100644 (file)
index 9986b00..0000000
--- a/systemd/ceph-rgw.tmpfiles.d.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# create rgw socket directory
-d /run/ceph-rgw 0755 @user_rgw@ @group_rgw@ - -