Merge lp:~aisrael/charm-helpers/HttpRelation into lp:charm-helpers

[Adam Israel]

This MP makes to changes to the HttpRelation:

1: change the 'host' required_key to 'hostname'. I did a cursory check of all charms returned via 'charm getall' and all of the website relations are using hostname.

2: change provide_data to return the hostname and port keys from the data provided by the relation, rather than private-address and the hard-coded port 80.

Unmerged revisions

294. By Adam Israel on 2015-01-23

Change the host required_key to hostname
Change provide_data to return the port provided by the relation, instead of assuming port 80

=== modified file 'charmhelpers/core/services/helpers.py'
--- charmhelpers/core/services/helpers.py	2015-01-22 06:06:03 +0000
+++ charmhelpers/core/services/helpers.py	2015-01-23 22:10:36 +0000
@@ -146,12 +146,12 @@
     """
     name = 'website'
     interface = 'http'
-    required_keys = ['host', 'port']
+    required_keys = ['hostname', 'port']
 
     def provide_data(self):
         return {
-            'host': hookenv.unit_get('private-address'),
-            'port': 80,
+            'host': hookenv.unit_get('hostname'),
+            'port': hookenv.unit_get('port'),
         }