openstack/charm-neutron-api
Code Issues Proposed changes

Merge lp:~james-page/charms/trusty/neutron-api/ml2-local-types [a=james-page] [r=tribaal]

Browse Source 
Add local network driver type to defaults.
This commit is contained in:
Christopher Glass 2015-09-09 11:03:19 +02:00
commit 52f549a7ba
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/icehouse/ml2_conf.ini
View File

@ -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]

4
templates/kilo/ml2_conf.ini
View File

@ -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]