From: Sage Weil Date: Wed, 14 Aug 2013 22:22:07 +0000 (-0700) Subject: mon/MonCap: remove useless 'osd crush add' perm from profile bootstrap-osd X-Git-Tag: v0.68~67^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed6233e58b259ff407219198fdb75ab9ec32a12e;p=ceph.git mon/MonCap: remove useless 'osd crush add' perm from profile bootstrap-osd Bootstrap doesn't use or need this; the crush update happens when the osd starts up (see init-ceph or upstart/ceph-osd.conf). Signed-off-by: Sage Weil Reviewed-by: Joao Eduardo Luis --- diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index b03873ad7ddc..d8bccce9bc28 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -148,7 +148,6 @@ void MonCapGrant::expand_profile(entity_name_t 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 create")); - profile_grants.push_back(MonCapGrant("osd crush set")); // FIXME: constraint this further? profile_grants.push_back(MonCapGrant("auth add")); profile_grants.back().command_args["entity"] = StringConstraint("", "osd."); profile_grants.back().command_args["caps_mon"] = StringConstraint("allow profile osd", "");