Merge lp://qastaging/~gnuoy/charms/trusty/neutron-api/next-haproxy-always into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

UOSCI bot says:
charm_lint_check #1230 neutron-api-next for gnuoy mp242899
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

Full lint test output: http://paste.ubuntu.com/9252832/
Build: http://10.98.191.181:8080/job/charm_lint_check/1230/

UOSCI bot says:
charm_unit_test #1064 neutron-api-next for gnuoy mp242899
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 2.645s
  OK

Full unit test output: http://paste.ubuntu.com/9252838/
Build: http://10.98.191.181:8080/job/charm_unit_test/1064/

UOSCI bot says:
charm_amulet_test #533 neutron-api-next for gnuoy mp242899
    AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/9252984/
Build: http://10.98.191.181:8080/job/charm_amulet_test/533/

charm_lint_check #306 neutron-api-next for gnuoy mp242899
    LINT OK: passed

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

charm_unit_test #334 neutron-api-next for gnuoy mp242899
    UNIT OK: passed

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

charm_amulet_test #469 neutron-api-next for gnuoy mp242899
    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/9568606/
Build: http://10.245.162.77:8080/job/charm_amulet_test/469/

charm_lint_check #524 neutron-api-next for gnuoy mp242899
    LINT OK: passed

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

charm_unit_test #553 neutron-api-next for gnuoy mp242899
    UNIT OK: passed

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

charm_amulet_test #680 neutron-api-next for gnuoy mp242899
    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/9675682/
Build: http://10.245.162.77:8080/job/charm_amulet_test/680/