Merge lp:~hopem/charms/precise/ceph/lp1228316 into lp:~charmers/charms/precise/ceph/trunk

[Edward Hope-Morley]

[Adam Gandelman (gandelman-a)]

* The _default_caps are already essentially the default client caps. Is it really required to redefine them?

* Why are the caps now being set in the relation to the remote service?

This still doesn't address the issue of upgrading. Example: I have a cluster with a relation to one client (eg, glance). glance has the previous mon caps 'allow r' I upgrade my cluster to dumpling (which now requires 'allow rw' for clients wishing to mk a pool) and the charm. I add a relation to cinder. cinder gets 'mon rw'. If for some reason things got crazy, and I had to recreate the pools (manual or otherwise), cinder would be able to and glance wouldn't and I would be scratching my head trying to find out why. I'd expect the permissions to be consistent across all relations after the upgrade.

I'd love to see an upgrade-charm hook that iterates through the current ceph relation, check the permissions of each client and add the 'w' bit if required.

review: Needs Information

[James Page (james-page)]

Ed

I reworked this to include upgrade to existing keys; This actually appears to be broken already for the cloud archive for grizzly - I think the requirement for rw on mon may have crept in with a SRU upgrade for ceph.

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2013-07-08 08:32:38 +0000
+++ hooks/ceph.py	2013-09-20 18:39:56 +0000
@@ -196,6 +196,11 @@
     'osd': ['allow rwx']
 }
 
+# charmed rbd clients currently create their own pool and need 'mon rw' to
+# create a pool with non-default settings (lp1228316)
+_default_client_caps = _default_caps
+_default_client_caps['mon'] = ['allow rw']
+
 
 def get_named_key(name, caps=None):
     caps = caps or _default_caps

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-06-25 11:03:02 +0000
+++ hooks/hooks.py	2013-09-20 18:39:56 +0000
@@ -190,8 +190,10 @@
         units = related_units(relid)
         if len(units) > 0:
             service_name = units[0].split('/')[0]
+            caps = ceph._default_client_caps
             relation_set(relation_id=relid,
-                         key=ceph.get_named_key(service_name),
+                         key=ceph.get_named_key(service_name,
+                                                caps=caps),
                          auth=config('auth-supported'))
 
     log('End notify_client.')
@@ -235,7 +237,8 @@
     if ceph.is_quorum():
         log('mon cluster in quorum - providing client with keys')
         service_name = remote_unit().split('/')[0]
-        relation_set(key=ceph.get_named_key(service_name),
+        relation_set(key=ceph.get_named_key(service_name,
+                                            caps=ceph._default_client_caps),
                      auth=config('auth-supported'))
     else:
         log('mon cluster not in quorum - deferring key provision')

=== modified file 'revision'
--- revision	2013-06-20 23:58:01 +0000
+++ revision	2013-09-20 18:39:56 +0000
@@ -1,1 +1,1 @@
-92
+93