~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

« back to all changes in this revision

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

  • Committer: Edward Hope-Morley
  • Date: 2015-12-21 17:41:11 UTC
  • mfrom: (53 ceph-radosgw)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: edward.hope-morley@canonical.com-20151221174111-28ifpbcpdoc4uw92
synced /next

Show diffs side-by-side

added added

removed removed

Lines of Context:
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'