Charm Helpers

Merge lp:~james-page/charm-helpers/add-key-override into lp:charm-helpers

  1. add-key-override
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 689
Proposed branch: lp:~james-page/charm-helpers/add-key-override
Merge into: lp:charm-helpers
Diff against target: 41 lines (+6/-3)
2 files modified
charmhelpers/contrib/storage/linux/ceph.py (+2/-2)
tests/contrib/storage/test_linux_ceph.py (+4/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/add-key-override
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+317243@code.launchpad.net

Description of the change

Allow charms to provide a key name when requesting access to pool groups.

To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
2--- charmhelpers/contrib/storage/linux/ceph.py 2017-02-09 14:49:13 +0000
3+++ charmhelpers/contrib/storage/linux/ceph.py 2017-02-14 17:41:49 +0000
4@@ -1045,13 +1045,13 @@
5 self.ops = []
6
7 def add_op_request_access_to_group(self, name, namespace=None,
8- permission=None):
9+ permission=None, key_name=None):
10 """
11 Adds the requested permissions to the current service's Ceph key,
12 allowing the key to access only the specified pools
13 """
14 self.ops.append({'op': 'add-permissions-to-key', 'group': name,
15- 'namespace': namespace, 'name': service_name(),
16+ 'namespace': namespace, 'name': key_name or service_name(),
17 'group-permission': permission})
18
19 def add_op_create_pool(self, name, replica_count=3, pg_num=None,
20
21=== modified file 'tests/contrib/storage/test_linux_ceph.py'
22--- tests/contrib/storage/test_linux_ceph.py 2017-02-09 21:52:57 +0000
23+++ tests/contrib/storage/test_linux_ceph.py 2017-02-14 17:41:49 +0000
24@@ -1077,13 +1077,16 @@
25 rq.add_op_create_pool('pool2')
26 rq.add_op_create_pool('pool3', group='test')
27 rq.add_op_request_access_to_group(name='test')
28+ rq.add_op_request_access_to_group(name='objects',
29+ key_name='test')
30 expected = {
31 'api-version': 1,
32 'request-id': 'uuid',
33 'ops': [{'op': 'create-pool', 'name': 'pool1', 'replicas': 1},
34 {'op': 'create-pool', 'name': 'pool2', 'replicas': 3},
35 {'op': 'create-pool', 'name': 'pool3', 'replicas': 3, 'group': 'test'},
36- {'op': 'add-permissions-to-key', 'group': 'test', 'name': 'service_test'}]
37+ {'op': 'add-permissions-to-key', 'group': 'test', 'name': 'service_test'},
38+ {'op': 'add-permissions-to-key', 'group': 'objects', 'name': 'test'}]
39 }
40 request_dict = json.loads(rq.request)
41 for key in ['api-version', 'request-id']:

Subscribers

People subscribed via source and target branches