Merge lp:~james-page/charms/precise/keystone/juju-core-fixes into lp:~charmers/charms/precise/keystone/trunk

[James Page]

Fixes for compatibility with juju-core.

These will be superceeded when keystone get charm-helpers'ed

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2013-05-22 10:28:56 +0000
+++ hooks/keystone_hooks.py	2013-08-13 12:57:06 +0000
@@ -240,6 +240,8 @@
                 ca_bundle = ca.get_ca_bundle()
                 relation_data['https_keystone'] = 'True'
                 relation_data['ca_cert'] = b64encode(ca_bundle)
+            if relation_id:
+                relation_data['rid'] = relation_id
             utils.relation_set(**relation_data)
             return
 

=== modified file 'hooks/lib/utils.py'
--- hooks/lib/utils.py	2013-03-21 18:28:05 +0000
+++ hooks/lib/utils.py	2013-08-13 12:57:06 +0000
@@ -206,11 +206,9 @@
         cmd.append('-r')
         cmd.append(relation_id)
     if remote_unit:
-        remote_unit_orig = os.getenv('JUJU_REMOTE_UNIT', None)
-        os.environ['JUJU_REMOTE_UNIT'] = remote_unit
+        cmd.append('-')
+        cmd.append(remote_unit)
     j = subprocess.check_output(cmd)
-    if remote_unit and remote_unit_orig:
-        os.environ['JUJU_REMOTE_UNIT'] = remote_unit_orig
     d = json.loads(j)
     settings = {}
     # convert unicode to strings

=== modified file 'revision'
--- revision	2013-05-22 10:28:56 +0000
+++ revision	2013-08-13 12:57:06 +0000
@@ -1,1 +1,1 @@
-221
+223