]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonCap: allow 'osd destroy-new' with bootstrap-osd caps
authorSage Weil <sage@redhat.com>
Tue, 5 Jun 2018 22:30:39 +0000 (17:30 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Jul 2018 13:13:19 +0000 (08:13 -0500)
This let's ceph-volume use the new command.

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

src/mon/MonCap.cc

index 73f4a07ad03ddc2b270a49cda6060d219472ae28..79d6b35da5a9b55449c6705427ff7e5eceb8b257 100644 (file)
@@ -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