Fixes from ivoks

hooks/charmhelpers/contrib/openstack/context.py

@@ -432,6 +432,8 @@ class ApacheSSLContext(OSContextGenerator):
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
+        if is_clustered():
+            ctxt['private_address'] = config('vip')
         for api_port in self.external_ports:
             ext_port = determine_apache_port(api_port)
             int_port = determine_api_port(api_port)

hooks/charmhelpers/contrib/unison/__init__.py

@@ -253,5 +253,5 @@ def sync_to_peer(host, user, paths=[], verbose=False):
 
 def sync_to_peers(peer_interface, user, paths=[], verbose=False):
     '''Sync all hosts to an specific path'''
-    for host in collect_authed_hosts():
+    for host in collect_authed_hosts(peer_interface):
         sync_to_peer(host, user, paths, verbose)

hooks/keystone_hooks.py

@@ -186,6 +186,7 @@ def ha_changed():
     if (clustered is not None and
         is_leader(CLUSTER_RES)):
         ensure_initial_admin(config)
+        CONFIGS.write_all()
         log('Cluster configured, notifying other services and updating '
             'keystone endpoint configuration')
         for rid in relation_ids('identity-service'):

revision

@@ -1 +1 @@
-230
+231

templates/haproxy.cfg

@@ -8,8 +8,8 @@ global
 
 defaults
     log global
-    mode http
-    option httplog
+    mode tcp
+    option tcplog
     option dontlognull
     retries 3
     timeout queue 1000
@@ -19,6 +19,7 @@ defaults
 
 listen stats :8888
     mode http
+    option httplog
     stats enable
     stats hide-version
     stats realm Haproxy\ Statistics
@@ -29,7 +30,6 @@ listen stats :8888
 {% for service, ports in service_ports.iteritems() -%}
 listen {{ service }} 0.0.0.0:{{ ports[0] }}
     balance roundrobin
-    option tcplog
     {% for unit, address in units.iteritems() -%}
     server {{ unit }} {{ address }}:{{ ports[1] }} check
     {% endfor %}