Charm Helpers

Merge lp://staging/~thedac/charm-helpers/lp1522130 into lp://staging/charm-helpers

  1. lp1522130
  2. Merge into devel
Proposed by David Ames
Status: Merged
Merged at revision: 500
Proposed branch: lp://staging/~thedac/charm-helpers/lp1522130
Merge into: lp://staging/charm-helpers
Diff against target: 56 lines (+22/-9)
2 files modified
charmhelpers/contrib/openstack/context.py (+6/-0)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+16/-9)
To merge this branch: bzr merge lp://staging/~thedac/charm-helpers/lp1522130
Reviewer Review Type Date Requested Status
James Page Approve
David Ames (community) Needs Resubmitting
Review via email: mp+279519@code.staging.launchpad.net

Description of the change

Fix bug #1522130

Add sane defaults for timeout connect and queue and make them configurable.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

I think this needs a fix for the HAproxy context, equivalent to the following:

        if config('haproxy-server-timeout'):
            ctxt['haproxy_server_timeout'] = config('haproxy-server-timeout')

        if config('haproxy-client-timeout'):
            ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')

review: Needs Fixing
Revision history for this message
James Page (james-page) wrote :

Could I also request that the whitespace slurping be fixed in the template:

defaults
    log global
    mode tcp
    option tcplog
    option dontlognull
    retries 3
    timeout queue 9000
    timeout connect 9000
timeout client 30000
timeout server 30000
listen stats :8888

This is what currently gets generated.

Revision history for this message
David Ames (thedac) wrote :

Added missing context bits for queue and connect timeouts.

Fixed up the whitespace problems in the template.

review: Needs Resubmitting
Revision history for this message
James Page (james-page) wrote :

David

Not sure why but your second commit drops a whole load of other stuff from the context module?

review: Needs Fixing
lp://staging/~thedac/charm-helpers/lp1522130 updated
495. By David Ames

Add haproxy context for new timeout values. Fix template whitespace

Revision history for this message
David Ames (thedac) wrote :

Ah, this is correct in the charms themselves. Fixed in CH.

review: Needs Resubmitting
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches