Merge lp://qastaging/~james-page/charms/trusty/neutron-gateway/xenial into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next

charm_lint_check #375 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/375/

charm_unit_test #298 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/298/

charm_amulet_test #149 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-12 18:43:55,513 validate_config_data DEBUG: Validating config file data (fwaas in /etc/neutron/fwaas_driver.ini on neutron-gateway/0)...
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15027737/
Build: http://10.245.162.36:8080/job/charm_amulet_test/149/

This one also seems legit. I could not root cause it yet.

charm_lint_check #727 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/727/

charm_unit_test #634 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/634/

charm_lint_check #730 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/730/

charm_unit_test #637 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/637/

charm_lint_check #744 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/744/

charm_unit_test #650 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/650/

charm_amulet_test #281 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-17 12:28:15,418 _validate_dict_data DEBUG: expected: {'quantum_port': '9696', 'auth_port': '35357', 'auth_protocol': 'http', 'keystone_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'auth_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_username': 'nova', 'service_tenant_name': 'services', 'service_protocol': 'http', 'service_tenant': 'services', 'quantum_url': <bound method OpenStackAmuletUtils.valid_url of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_password': <bound method OpenStackAmuletUtils.not_null of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_port': '5000', 'region': 'RegionOne', 'quantum_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'private-address': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'quantum_plugin': 'ovs'}
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15099836/
Build: http://10.245.162.36:8080/job/charm_amulet_test/281/

charm_amulet_test #284 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
juju-test.conductor.019-basic-trusty-mitaka DEBUG : Got exit code: 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15099927/
Build: http://10.245.162.36:8080/job/charm_amulet_test/284/

charm_amulet_test #297 neutron-gateway-next for james-page mp285862
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/297/

LGTM, merging.