diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-25 17:58:47 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-25 17:58:47 -0700 |
| commit | dfabc61c2cf8cba246f431ee1df86c850c3e7e6e (patch) | |
| tree | b06f82273fc6274c43fda8fbacdcd6ad6a1b2957 | |
| parent | ca8ac9502bdfce888decd4b53669ef57858afcf6 (diff) | |
| download | ceph-dfabc61c2cf8cba246f431ee1df86c850c3e7e6e.tar.gz | |
mon/MonCap: match param for entity (not name)
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
| -rw-r--r-- | src/mon/MonCap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index 8e35b775247..7ac8d142d87 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -149,7 +149,7 @@ void MonCapGrant::expand_profile(entity_name_t name) const 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["name"] = StringConstraint("", "osd."); + profile_grants.back().command_args["entity"] = StringConstraint("", "osd."); profile_grants.back().command_args["caps_mon"] = StringConstraint("allow profile osd", ""); profile_grants.back().command_args["caps_osd"] = StringConstraint("allow *", ""); } @@ -158,7 +158,7 @@ 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("auth get-or-create")); // FIXME: this can expose other mds keys - profile_grants.back().command_args["name"] = StringConstraint("", "mds."); + profile_grants.back().command_args["entity"] = StringConstraint("", "mds."); profile_grants.back().command_args["caps_mon"] = StringConstraint("allow profile mds", ""); profile_grants.back().command_args["caps_osd"] = StringConstraint("allow rwx", ""); profile_grants.back().command_args["caps_mds"] = StringConstraint("allow", ""); |