Merge lp:~gandelman-a/charms/precise/openstack-dashboard/haproxy_mode_default into lp:~openstack-charmers/charms/precise/openstack-dashboard/ha-support

[Adam Gandelman]

Was about to sync these changes into the helpers branch but realized we can default the mode and avoid having to update the interface on all charms that use this currently, allowing a quick sync.

[James Page (james-page)]

review: Approve

=== modified file 'hooks/lib/openstack-common'
--- hooks/lib/openstack-common	2013-03-13 11:08:28 +0000
+++ hooks/lib/openstack-common	2013-03-15 18:46:17 +0000
@@ -329,6 +329,8 @@
 #   assumes the name of the peer relation is 'cluster' and that every
 #   service unit in the peer relation is running the same services.
 #
+#   Services that do not specify :mode in parameter will default to http.
+#
 # Example
 #   configure_haproxy cinder_api:8776:8756:tcp nova_api:8774:8764:http
 ##########################################################################
@@ -369,6 +371,7 @@
     local haproxy_listen_port=$(echo $service | cut -d : -f 2)
     local api_listen_port=$(echo $service | cut -d : -f 3)
     local mode=$(echo $service | cut -d : -f 4)
+    [[ -z "$mode" ]] && mode="http"
     juju-log "Adding haproxy configuration entry for $service "\
              "($haproxy_listen_port -> $api_listen_port)"
     cat >> $HAPROXY_CFG << EOF