Merge lp:~negronjl/charms/precise/ceph/lp1307712 into lp:~openstack-charmers-archive/charms/precise/ceph/trunk

[Juan L. Negron]

Fix for LP:1307712

Any charm with "key" in their service name will fail the client relation in ceph. This makes the search for "key" a bit more specific as to try to avoid naming conflicts

[James Page (james-page)]

LGTM

review: Approve

[Edward Hope-Morley (hopem)]

Is 'key=<val>' valid i.e. no whitespace around '='? If so this will need adjusting. Maybe better to use regex to match the "\s=\s" then split on '=' and strip whitepace?

[Juan L. Negron (negronjl)]

Ed:

From what I read in the code of the different charms, key=<val> is not valid ... it is key = <val> ( with the spaces in there ).

Unmerged revisions

70. By Juan L. Negron on 2014-04-14

Be more specific when looking for a key as not to conflict with service names

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2013-09-23 10:19:06 +0000
+++ hooks/ceph.py	2014-04-14 20:57:24 +0000
@@ -191,7 +191,7 @@
         key = raw_key
     else:
         for element in raw_key.splitlines():
-            if 'key' in element:
+            if 'key = ' in element:
                 key = element.split(' = ')[1].strip()  # IGNORE:E1103
     return key