Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ceph_volume_client: set an existing auth ID's default mon caps #11917

Merged
merged 1 commit into from
Nov 23, 2016
Merged

ceph_volume_client: set an existing auth ID's default mon caps #11917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/pybind/ceph_volume_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ def cap_update(orig, want, unwanted):
'caps': [
'mds', mds_cap_str,
'osd', osd_cap_str,
'mon', cap['caps'].get('mon')]
'mon', cap['caps'].get('mon', 'allow r')]
})
caps = self._rados_command(
'auth get',
Expand Down Expand Up @@ -1218,7 +1218,7 @@ def cap_remove(orig, want):
'caps': [
'mds', mds_cap_str,
'osd', osd_cap_str,
'mon', cap['caps'].get('mon')]
'mon', cap['caps'].get('mon', 'allow r')]
})

# FIXME: rados raising Error instead of ObjectNotFound in auth get failure
Expand Down