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

Proposed by David Ames
Status: Merged
Merged at revision: 154
Proposed branch: lp://staging/~thedac/charms/trusty/glance/lp1522130
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 79 lines (+34/-9)
3 files modified
charmhelpers/contrib/openstack/context.py (+6/-0)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+16/-9)
config.yaml (+12/-0)
To merge this branch: bzr merge lp://staging/~thedac/charms/trusty/glance/lp1522130
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+279529@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_unit_test #13816 glance-next for thedac mp279529
    UNIT OK: passed

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

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

charm_lint_check #14820 glance-next for thedac mp279529
    LINT OK: passed

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

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

charm_amulet_test #8137 glance-next for thedac mp279529
    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/13659645/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8137/

155. 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 #15046 glance-next for thedac mp279529
    LINT OK: passed

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

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

charm_unit_test #14037 glance-next for thedac mp279529
    UNIT OK: passed

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

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

charm_amulet_test #8208 glance-next for thedac mp279529
    AMULET OK: passed

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

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