Merge lp:~niedbalski/charm-helpers/fix-1697002 into lp:charm-helpers

[Jorge Niedbalski]

Modify the haproxy.cfg template to use the default
unix listen socket created by rsyslog on /e/rsyslog.d/49-haproxy.conf.

Fixes LP: #1697002.

[Felipe Reyes (freyes)]

As we discussed over IRC, currently the logs are being sent syslog via localhost, but rsyslog's default configuration is not configured to send those messages to haproxy.log and they are sent to /dev/null . Even when it would be possible to configure rsyslog to send them to haproxy.log we would be deviating more from what the deb package does by default, so this change is more appropriate.

review: Approve

[lp:~niedbalski/charm-helpers/fix-1697002]

752. By Edward Hope-Morley on 2017-06-12

[thedac, r=hopem,ajkavanagh]

Update use of client.service_catalog with sessions

Due to a bug in keystone client when using keystoneauth1.sessions
keystoneclient.service_catalog is no longer populated automatically.

Manually setting client.auth_ref has the side effect of populating
the service_catalog and has become the undocumented but accepted
practice.

This change adds the manual setting of auth_ref and updates the query
arguments for url_for().

753. By Jorge Niedbalski on 2017-06-12

[niedbalski,r=freyes] Fix for LP: #1697002.

=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2017-03-30 18:38:26 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2017-06-09 16:30:51 +0000
@@ -1,6 +1,6 @@
 global
-    log {{ local_host }} local0
-    log {{ local_host }} local1 notice
+    log /var/lib/haproxy/dev/log local0
+    log /var/lib/haproxy/dev/log local1 notice
     maxconn 20000
     user haproxy
     group haproxy