Merge lp:~jjo/charms/trusty/swift-proxy/swift_hash-from-JUJU_ENV_UUID-and-service_name into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

[JuanJo Ciarlante]

[James Page (james-page)]

Hi jjo

I just want to check that JUJU_ENV_UUID is going to stick around but this looks entirely sane from my perspective.

review: Needs Fixing

[James Page (james-page)]

review: Needs Information

[Edward Hope-Morley (hopem)]

An alternative way to do this would be to have the 'leader' create the hash and use peer relation to distribute but I don't have a problem with this doing it this way for now and since the charm is stuff as it is when using autohash i'm gonna declare it LGTM.

Doing a test deploy now and if passes i'm happy to merge this

review: Approve

=== modified file 'hooks/swift_context.py'
--- hooks/swift_context.py	2014-09-25 06:20:53 +0000
+++ hooks/swift_context.py	2014-10-06 15:40:02 +0000
@@ -4,7 +4,8 @@
     relation_ids,
     related_units,
     relation_get,
-    unit_get
+    unit_get,
+    service_name
 )
 
 from charmhelpers.contrib.openstack.context import (
@@ -26,6 +27,7 @@
 from charmhelpers.contrib.openstack.utils import get_host_ip
 import subprocess
 import os
+import uuid
 
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -230,10 +232,8 @@
         with open(SWIFT_HASH_FILE, 'w') as hashfile:
             hashfile.write(swift_hash)
     else:
-        cmd = ['od', '-t', 'x8', '-N', '8', '-A', 'n']
-        rand = open('/dev/random', 'r')
-        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=rand)
-        swift_hash = p.communicate()[0].strip()
+        swift_hash = str(uuid.uuid3(uuid.UUID(os.environ.get("JUJU_ENV_UUID")),
+                                    service_name()))
         with open(SWIFT_HASH_FILE, 'w') as hashfile:
             hashfile.write(swift_hash)
     return swift_hash