Merge lp://staging/~thedac/charms/trusty/ceph-radosgw/lp1522130 into lp://staging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next

Proposed by David Ames
Status: Merged
Merged at revision: 53
Proposed branch: lp://staging/~thedac/charms/trusty/ceph-radosgw/lp1522130
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph-radosgw/next
Diff against target: 88 lines (+46/-9)
3 files modified
config.yaml (+24/-0)
hooks/charmhelpers/contrib/openstack/context.py (+6/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+16/-9)
To merge this branch: bzr merge lp://staging/~thedac/charms/trusty/ceph-radosgw/lp1522130
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+279531@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
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #14817 ceph-radosgw-next for thedac mp279531
    LINT OK: passed

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

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

charm_amulet_test #8136 ceph-radosgw-next for thedac mp279531
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

54. By David Ames

Add haproxy context for new timeout values. Fix template whitespace

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

charm_lint_check #15043 ceph-radosgw-next for thedac mp279531
    LINT OK: passed

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

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

charm_unit_test #14031 ceph-radosgw-next for thedac mp279531
    UNIT OK: passed

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

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

charm_amulet_test #8211 ceph-radosgw-next for thedac mp279531
    AMULET OK: passed

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

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