Juju Charms Collection
swift-proxy package

Merge lp:~brad-marshall/charms/trusty/swift-proxy/haproxy-add-timeout into lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. haproxy-add-timeout
  3. Merge into next
Proposed by Brad Marshall
Status: Merged
Merged at revision: 128
Proposed branch: lp:~brad-marshall/charms/trusty/swift-proxy/haproxy-add-timeout
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 19 lines (+12/-0)
1 file modified
config.yaml (+12/-0)
To merge this branch: bzr merge lp:~brad-marshall/charms/trusty/swift-proxy/haproxy-add-timeout
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+278670@code.launchpad.net

Description of the change

Expose haproxy server and client timeouts via config.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #14419 swift-proxy-next for brad-marshall mp278670
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14419/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #13441 swift-proxy-next for brad-marshall mp278670
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13441/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8034 swift-proxy-next for brad-marshall mp278670
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv08
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13513054/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8034/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

FYI, undercloud issue caused amulet fail on #8034.

Rerunning tests...

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8053 swift-proxy-next for brad-marshall mp278670
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8053/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-09-23 16:28:19 +0000
3+++ config.yaml 2015-11-26 07:26:47 +0000
4@@ -265,3 +265,15 @@
5 wait for you to execute the openstack-upgrade action for this charm on
6 each unit. If False it will revert to existing behavior of upgrading
7 all units on config change.
8+ haproxy-server-timeout:
9+ type: int
10+ default:
11+ description: |
12+ Server timeout configuration in ms for haproxy, used in HA configurations.
13+ If not provided, default value of 30000ms is used.
14+ haproxy-client-timeout:
15+ type: int
16+ default:
17+ description: |
18+ Client timeout configuration in ms for haproxy, used in HA
19+ configurations. If not provided, default value of 30000ms is used.

Subscribers

People subscribed via source and target branches