openstack/charm-ceph-proxy
Code Issues Proposed changes

modify default_caps to match current ceph-mon caps

Browse Source 
The current default caps in ceph-proxy are not up to date with
charm-ceph-mon caps.

Change-Id: Iaeb8d4dea9c36f522aeaddf54b19e4947c81a559
Closes-Bug: #1794071
This commit is contained in:
Dmitrii Shcherbakov 2018-09-20 04:35:29 +03:00
parent df29b5780f
commit 331e8451c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hooks/ceph.py
View File

@ -11,6 +11,7 @@ import time
import os import os
import re import re
import sys import sys
import collections
from charmhelpers.contrib.storage.linux.utils import ( from charmhelpers.contrib.storage.linux.utils import (
is_block_device, is_block_device,
@ -343,10 +344,11 @@ def get_radosgw_key():
return get_named_key('radosgw.gateway', _radosgw_caps) return get_named_key('radosgw.gateway', _radosgw_caps)
_default_caps = { _default_caps = collections.OrderedDict([
'mon': ['allow rw'], ('mon', ['allow r',
'osd': ['allow rwx'] 'allow command "osd blacklist"']),
} ('osd', ['allow rwx']),
])
admin_caps = { admin_caps = {
'mds': ['allow'], 'mds': ['allow'],