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

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

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

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

charm_lint_check #14816 keystone-next for thedac mp279527
    LINT OK: passed

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

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

charm_amulet_test #8139 keystone-next for thedac mp279527
    AMULET OK: passed

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

194. 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_unit_test #14033 keystone-next for thedac mp279527
    UNIT OK: passed

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

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

charm_lint_check #15049 keystone-next for thedac mp279527
    LINT OK: passed

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

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

charm_amulet_test #8212 keystone-next for thedac mp279527
    AMULET OK: passed

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

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