← Back to branch summary

~gnuoy/charms/trusty/glance/1537769

« back to all changes in this revision

Viewing changes to charmhelpers/contrib/openstack/context.py

  • Committer: James Page
  • Date: 2015-12-10 10:58:31 UTC
  • mfrom: (153.1.2 glance)
  • Revision ID: james.page@ubuntu.com-20151210105831-qfgxgyok2p8p4gsy
Add sane haproxy timeout defaults and make them configurable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
charmhelpers/contrib/openstack/context.py
626
626
        if config('haproxy-client-timeout'):
627
627
            ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
628
628
 
 
629
        if config('haproxy-queue-timeout'):
 
630
            ctxt['haproxy_queue_timeout'] = config('haproxy-queue-timeout')
 
631
 
 
632
        if config('haproxy-connect-timeout'):
 
633
            ctxt['haproxy_connect_timeout'] = config('haproxy-connect-timeout')
 
634
 
629
635
        if config('prefer-ipv6'):
630
636
            ctxt['ipv6'] = True
631
637
            ctxt['local_host'] = 'ip6-localhost'