diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-13 20:27:23 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-13 20:27:23 +0200 |
| commit | 987f175fb83efc2ce582966fbffc04680dd603f5 (patch) | |
| tree | 9963888b5056586156acef43250eb5c04c63ac08 /src/mon/MonCap.cc | |
| parent | Merge branch 'wip-tell' into next (diff) | |
| download | ceph-987f175fb83efc2ce582966fbffc04680dd603f5.tar.xz ceph-987f175fb83efc2ce582966fbffc04680dd603f5.zip | |
mon/MonCap: bootstrap-* need to subscribe to osdmap, monmap
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mon/MonCap.cc')
| -rw-r--r-- | src/mon/MonCap.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index bf8eb6fb79d..6f1055091e0 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -143,6 +143,8 @@ void MonCapGrant::expand_profile(entity_name_t name) const profile_grants.push_back(MonCapGrant("config-key delete", "key", StringConstraint("", prefix))); } if (profile == "bootstrap-osd") { + profile_grants.push_back(MonCapGrant("mon", MON_CAP_R)); // read monmap + 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? @@ -152,6 +154,8 @@ void MonCapGrant::expand_profile(entity_name_t name) const profile_grants.back().command_args["caps_osd"] = StringConstraint("allow *", ""); } if (profile == "bootstrap-mds") { + profile_grants.push_back(MonCapGrant("mon", MON_CAP_R)); // read monmap + 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."); |