Merge ~johnsca/charms/+source/http:imports into ~bcsaller/charms/+source/http:master

[Cory Johns]

Fixed imports due to charms.reactive split.
Also made hostname automatic and implicit, since I can't envision ever wanting to send anything other than private-address.

Unmerged commits

0df7fc8... by Cory Johns on 2015-08-20

Fixed imports for charms.reactive split and made hostname automatic

diff --git a/provides.py b/provides.py
index 56fbd41..6ca360c 100644
--- a/provides.py
+++ b/provides.py
@@ -1,6 +1,7 @@
-from charmhelpers.core.reactive import hook
-from charmhelpers.core.reactive import RelationBase
-from charmhelpers.core.reactive import scopes
+from charmhelpers.core import hookenv
+from charms.reactive import hook
+from charms.reactive import RelationBase
+from charms.reactive import scopes
 
 
 class HttpProvides(RelationBase):
@@ -14,9 +15,9 @@ class HttpProvides(RelationBase):
     def broken(self):
         self.remove_state('{relation_name}.available')
 
-    def configure(self, hostname, port):
+    def configure(self, port):
         relation_info = {
-            'hostname': hostname,
+            'hostname': hookenv.unit_get('private-address'),
             'port': port,
         }
         self.set_remote(**relation_info)