Pre-release charm-helpers sync 17.02

Get each charm up to date with lp:charm-helpers for release testing.

Change-Id: I571bf54fa32837cac1058f8b880bbf981b12acbe
This commit is contained in:
David Ames 2017-02-14 11:48:46 -08:00
parent cee77d9414
commit 912d1f75b2
1 changed files with 2 additions and 2 deletions

View File

@ -1045,13 +1045,13 @@ class CephBrokerRq(object):
self.ops = []
def add_op_request_access_to_group(self, name, namespace=None,
permission=None):
permission=None, key_name=None):
"""
Adds the requested permissions to the current service's Ceph key,
allowing the key to access only the specified pools
"""
self.ops.append({'op': 'add-permissions-to-key', 'group': name,
'namespace': namespace, 'name': service_name(),
'namespace': namespace, 'name': key_name or service_name(),
'group-permission': permission})
def add_op_create_pool(self, name, replica_count=3, pg_num=None,