Merge lp:~gnuoy/charms/trusty/neutron-openvswitch/ice-meta into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10571 neutron-openvswitch-next for gnuoy mp272123
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9760 neutron-openvswitch-next for gnuoy mp272123
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6708 neutron-openvswitch-next for gnuoy mp272123
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

[Chris Glass (tribaal)]

This branch *should* work and LGTM, but it'd be good to have UOSCI +1 it too (seems like a transient error - just a timeout).

Will merge after that.

[lp:~gnuoy/charms/trusty/neutron-openvswitch/ice-meta]

88. By Liam Young on 2015-09-24

Empty commit to kick osci

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9814 neutron-openvswitch-next for gnuoy mp272123
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10629 neutron-openvswitch-next for gnuoy mp272123
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6715 neutron-openvswitch-next for gnuoy mp272123
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

[lp:~gnuoy/charms/trusty/neutron-openvswitch/ice-meta]

89. By Liam Young on 2015-09-28

Merged next in

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10176 neutron-openvswitch-next for gnuoy mp272123
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10971 neutron-openvswitch-next for gnuoy mp272123
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6865 neutron-openvswitch-next for gnuoy mp272123
    AMULET OK: passed

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

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

=== added file 'templates/icehouse/metadata_agent.ini'
--- templates/icehouse/metadata_agent.ini	1970-01-01 00:00:00 +0000
+++ templates/icehouse/metadata_agent.ini	2015-09-28 14:09:08 +0000
@@ -0,0 +1,20 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+# Metadata service seems to cache neutron api url from keystone so trigger
+# restart if it changes: {{ quantum_url }}
+
+[DEFAULT]
+auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
+auth_region = {{ region }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
+state_path = /var/lib/neutron
+# Gateway runs a metadata API server locally
+#nova_metadata_ip = {{ local_ip }}
+nova_metadata_port = 8775
+metadata_proxy_shared_secret = {{ shared_secret }}
+cache_url = memory://?default_ttl=5