Juju Charms Collection
neutron-api package

Merge lp://qastaging/~hopem/charms/trusty/neutron-api/pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. pki-token-support
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 84
Proposed branch: lp://qastaging/~hopem/charms/trusty/neutron-api/pki-token-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 465 lines (+244/-24)
14 files modified
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+41/-7)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+26/-9)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+37/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/core/fstab.py (+2/-2)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/neutron_api_utils.py (+3/-1)
templates/icehouse/neutron.conf (+1/-1)
templates/kilo/neutron.conf (+1/-1)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/neutron-api/pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250370@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2136 neutron-api-next for hopem mp250370
    LINT OK: passed

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

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

charm_unit_test #1925 neutron-api-next for hopem mp250370
    UNIT OK: passed

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

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

charm_amulet_test #2044 neutron-api-next for hopem mp250370
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

lp://qastaging/~hopem/charms/trusty/neutron-api/pki-token-support updated
82. By Edward Hope-Morley

synced /next

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

charm_lint_check #2209 neutron-api-next for hopem mp250370
    LINT OK: passed

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

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

charm_unit_test #1998 neutron-api-next for hopem mp250370
    UNIT OK: passed

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

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

charm_amulet_test #2155 neutron-api-next for hopem mp250370
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

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