Merge lp:~gnuoy/charms/precise/haproxy/allow-reverseproxy-charms-by-name into lp:charms/haproxy

[Liam Young]

When a unit joins the haproxy reverseproxy relationship. Check whether there is an existing stanza which matches its name. If there is then add it to that stanza. This allow charms which don't specify a service name to be added to specific haproxy stanzas.

For example is haproxy has been setup already with a musicsearch and videosearch stanza then,

juju deploy solr-jetty musicsearch
juju deploy solr-jetty videosearch
juju add-relation haproxy musicsearch
juju add-relation haproxy videosearch

will now add each unit to the stanza with the corresponding name.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Approved.

-Juan

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2012-09-17 15:31:30 +0000
+++ hooks/hooks.py	2012-10-01 06:35:22 +0000
@@ -344,6 +344,7 @@
             subprocess.check_output(['relation-list', '--format=json',
                                      '-r', relid])):
                 relation_info = relation_get(None, unit, relid)
+                unit_name = unit.rpartition('/')[0]
                 if type(relation_info) != type({}):
                     sys.exit(0)
                 # Mandatory switches ( hostname, port )
@@ -361,6 +362,8 @@
                         'juju-log', 'service %s does not exists. ' % \
                         relation_info['service_name']])
                         sys.exit(1)
+                elif unit_name in services_dict:
+                    service_name = unit_name
                 else:
                     service_name = services_list[0]['service_name']
                 if os.path.exists("%s/%s.is.proxy" % \