Move rbdmap file to /etc/ceph

Signed-off-by: Laurent Barbe <laurent@ksperis.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 0cab8124ac366ad038173db09f6be5e1784cbb64..1d2301ae89b19791e66dd541267b956a62a3ea3d 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -284,7 +284,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
 install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
 install -D src/init-rbd $RPM_BUILD_ROOT%{_initrddir}/rbdmap
-install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/rbdmap
+install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 ln -sf ../../etc/init.d/ceph %{buildroot}/%{_sbindir}/rcceph
 ln -sf ../../etc/init.d/ceph-radosgw %{buildroot}/%{_sbindir}/rcceph-radosgw
@@ -408,7 +408,7 @@ fi
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %config %{_sysconfdir}/bash_completion.d/rbd
 %{_initrddir}/rbdmap
-%config(noreplace) %{_sysconfdir}/rbdmap
+%config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
 %{_mandir}/man8/ceph-mon.8*

diff --git a/debian/ceph.install b/debian/ceph.install
index f29450f416392d936841ac738ce76c6ee5dd3067..25e5c1d709eb01ebe5e790349e2a4fa4c7d02ac7 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -28,5 +28,5 @@ usr/share/man/man8/crushtool.8
 usr/share/man/man8/mkcephfs.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
-etc/rbdmap
+etc/ceph/rbdmap
 etc/init.d/rbdmap

diff --git a/debian/rules b/debian/rules
index b6e2622b5625650e1a42aae37e3b436202dec399..c32c3e280b3852fc807085eb588cd2e63d376323 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ install: build
        install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
        install -D -m 644 udev/60-ceph-partuuid-workaround.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
        install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
-       install -D -m 644 src/rbdmap $(DESTDIR)/etc/rbdmap
+       install -D -m 644 src/rbdmap $(DESTDIR)/etc/ceph/rbdmap
        install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap
 
 # Add here commands to install the package into debian/testpack.

diff --git a/src/init-rbdmap b/src/init-rbdmap
index 31c90da416c393e1077349d33b391d08e3426b54..6ea4af7624b5497965bccb4e7abe6e3a8ed6b501 100755 (executable)
--- a/src/init-rbdmap
+++ b/src/init-rbdmap
@@ -11,7 +11,7 @@
 ### END INIT INFO
 
 DESC="RBD Mapping"
-RBDMAPFILE="/etc/rbdmap"
+RBDMAPFILE="/etc/ceph/rbdmap"
 
 . /lib/lsb/init-functions