From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Jun 2018 22:30:39 +0000 (-0500)
Subject: mon/MonCap: allow 'osd destroy-new' with bootstrap-osd caps
X-Git-Tag: v13.2.2~98^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=736ccee8c19098607b22d04442ce4718320ce3af;p=ceph.git

mon/MonCap: allow 'osd destroy-new' with bootstrap-osd caps

This let's ceph-volume use the new command.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d106ff4668aae445dd3ff53d10b54f970a5fa36a)
---

diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
index 73f4a07ad03..79d6b35da5a 100644
--- a/src/mon/MonCap.cc
+++ b/src/mon/MonCap.cc
@@ -217,6 +217,7 @@ void MonCapGrant::expand_profile_mon(const EntityName& name) const
     profile_grants.push_back(MonCapGrant("osd", MON_CAP_R));  // read osdmap
     profile_grants.push_back(MonCapGrant("mon getmap"));
     profile_grants.push_back(MonCapGrant("osd new"));
+    profile_grants.push_back(MonCapGrant("osd destroy-new"));
   }
   if (profile == "bootstrap-mds") {
     profile_grants.push_back(MonCapGrant("mon", MON_CAP_R));  // read monmap