From: Sébastien Han <seb@redhat.com>
Date: Wed, 31 Oct 2018 14:07:42 +0000 (+0100)
Subject: spec: add missing rbd mirror bootstrap directory
X-Git-Tag: 3.2-0~19^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8c8d60d3c7bf8d38c0a47770af883f55369cf216;p=ceph-ci.git

spec: add missing rbd mirror bootstrap directory

Currently /var/lib/ceph/bootstrap-rbd-mirror is absent, which means we
need to create it manually in order to pool the
client.bootstrap-rbd-mirror key.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 76d6cfd63a7..8e9beb5cd49 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1103,6 +1103,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 
 %if 0%{?suse_version}
 # create __pycache__ directories and their contents
@@ -1179,6 +1180,7 @@ rm -rf %{buildroot}
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
+%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 
 %post base
 /sbin/ldconfig
diff --git a/debian/ceph-base.dirs b/debian/ceph-base.dirs
index 6f580230a65..d0b8a9e103c 100644
--- a/debian/ceph-base.dirs
+++ b/debian/ceph-base.dirs
@@ -3,6 +3,7 @@ var/lib/ceph/bootstrap-mgr
 var/lib/ceph/bootstrap-osd
 var/lib/ceph/bootstrap-rgw
 var/lib/ceph/bootstrap-rbd
+var/lib/ceph/bootstrap-rbd-mirror
 var/lib/ceph/tmp
 var/lib/ceph/crash
 var/lib/ceph/crash/posted