Merge lp:~james-page/charms/trusty/neutron-api/ml2-local-types into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[James Page]

[Chris Glass (tribaal)]

Looks good! +1

Thanks for the fast response.

review: Approve

[Ryan Beisner (1chb1n)]

Grrr. This broke the amulet test, and would have had a failing amulet test result posted back here automatically, given a bit of time. ;-)

00:17:27.678 2015-09-10 01:54:44,934 validate_config_data DEBUG: Validating config file data (ml2 in /etc/neutron/plugins/ml2/ml2_conf.ini on neutron-api/0)...

00:17:27.678 ml2 config error: section [ml2] type_drivers:gre,vlan,flat,local != expected type_drivers:gre,vlan,flat

A corresponding amulet test update is needed.

review: Needs Resubmitting

[Björn Tillenius (bjornt)]

MP for fixing those tests: https://code.launchpad.net/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes/+merge/270630

=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2015-06-08 12:50:27 +0000
+++ templates/icehouse/ml2_conf.ini	2015-09-09 08:39:15 +0000
@@ -8,8 +8,8 @@
 type_drivers = local,flat
 mechanism_drivers = calico
 {% else -%}
-type_drivers = {{ overlay_network_type }},vlan,flat
-tenant_network_types = {{ overlay_network_type }},vlan,flat
+type_drivers = {{ overlay_network_type }},vlan,flat,local
+tenant_network_types = {{ overlay_network_type }},vlan,flat,local
 mechanism_drivers = openvswitch,hyperv,l2population
 
 [ml2_type_gre]

=== modified file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-06-16 09:13:13 +0000
+++ templates/kilo/ml2_conf.ini	2015-09-09 08:39:15 +0000
@@ -8,8 +8,8 @@
 type_drivers = local,flat
 mechanism_drivers = calico
 {% else -%}
-type_drivers = {{ overlay_network_type }},vlan,flat
-tenant_network_types = {{ overlay_network_type }},vlan,flat
+type_drivers = {{ overlay_network_type }},vlan,flat,local
+tenant_network_types = {{ overlay_network_type }},vlan,flat,local
 mechanism_drivers = openvswitch,l2population
 
 [ml2_type_gre]