Juju Charms Collection
neutron-api package

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

  1. Trusty Tahr (14.04)
  2. lp1522130
  3. Merge into next
Proposed by David Ames
Status: Merged
Merged at revision: 158
Proposed branch: lp://staging/~thedac/charms/trusty/neutron-api/lp1522130
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 103 lines (+48/-11)
4 files modified
config.yaml (+24/-0)
hooks/charmhelpers/contrib/openstack/context.py (+6/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+16/-9)
hooks/neutron_api_utils.py (+2/-2)
To merge this branch: bzr merge lp://staging/~thedac/charms/trusty/neutron-api/lp1522130
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+279525@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 #14815 neutron-api-next for thedac mp279525
    LINT OK: passed

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

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

charm_unit_test #13821 neutron-api-next for thedac mp279525
    UNIT OK: passed

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

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

charm_amulet_test #8138 neutron-api-next for thedac mp279525
    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/13661686/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8138/

lp://staging/~thedac/charms/trusty/neutron-api/lp1522130 updated
160. 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 #15045 neutron-api-next for thedac mp279525
    LINT OK: passed

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

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

charm_unit_test #14035 neutron-api-next for thedac mp279525
    UNIT OK: passed

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

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

charm_amulet_test #8215 neutron-api-next for thedac mp279525
    AMULET OK: passed

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

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