Juju Charms Collection
neutron-api-odl package

Merge lp://staging/~1chb1n/charms/trusty/neutron-api-odl/next-ch-sync-1601 into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api-odl/next

  1. Trusty Tahr (14.04)
  2. next-ch-sync-1601
  3. Merge into next
Proposed by Ryan Beisner
Status: Needs review
Proposed branch: lp://staging/~1chb1n/charms/trusty/neutron-api-odl/next-ch-sync-1601
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api-odl/next
Diff against target: 2055 lines (+887/-288)
19 files modified
hooks/charmhelpers/contrib/network/ip.py (+21/-19)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-3)
hooks/charmhelpers/contrib/openstack/context.py (+32/-2)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5)
hooks/charmhelpers/contrib/openstack/neutron.py (+8/-8)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11)
hooks/charmhelpers/contrib/openstack/utils.py (+100/-54)
hooks/charmhelpers/contrib/python/packages.py (+13/-4)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+441/-59)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0)
hooks/charmhelpers/core/hookenv.py (+41/-7)
hooks/charmhelpers/core/host.py (+103/-43)
hooks/charmhelpers/core/services/helpers.py (+11/-5)
hooks/charmhelpers/core/templating.py (+13/-7)
hooks/charmhelpers/fetch/__init__.py (+9/-1)
hooks/charmhelpers/fetch/archiveurl.py (+1/-1)
hooks/charmhelpers/fetch/bzrurl.py (+22/-32)
hooks/charmhelpers/fetch/giturl.py (+19/-24)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+8/-3)
To merge this branch: bzr merge lp://staging/~1chb1n/charms/trusty/neutron-api-odl/next-ch-sync-1601
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+283570@code.staging.launchpad.net

Description of the change

Sync charmhelpers for 16.01. *odl* charms were missed in recent pre-release ch-sync efforts.

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

charm_lint_check #17932 neutron-api-odl-next for 1chb1n mp283570
    LINT OK: passed

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

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

charm_unit_test #16757 neutron-api-odl-next for 1chb1n mp283570
    UNIT OK: passed

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

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

charm_amulet_test #8954 neutron-api-odl-next for 1chb1n mp283570
    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/14595471/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8954/

Reply

Unmerged revisions

12. By Ryan Beisner

sync charmhelpers for mitaka cloud archive recognition

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