← Back to branch summary

~ionutbalutoiu/charms/trusty/neutron-api/next

« back to all changes in this revision

Viewing changes to templates/kilo/ml2_conf.ini

  • Committer: Christopher Glass
  • Date: 2015-09-09 09:03:19 UTC
  • mfrom: (139.1.1 trunk)
  • Revision ID: christopher.glass@canonical.com-20150909090319-39mze1ejk41xut0w
Merge lp:~james-page/charms/trusty/neutron-api/ml2-local-types [a=james-page] [r=tribaal]

Add local network driver type to defaults.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/kilo/ml2_conf.ini
8
8
type_drivers = local,flat
9
9
mechanism_drivers = calico
10
10
{% else -%}
11
 
type_drivers = {{ overlay_network_type }},vlan,flat
12
 
tenant_network_types = {{ overlay_network_type }},vlan,flat
 
11
type_drivers = {{ overlay_network_type }},vlan,flat,local
 
12
tenant_network_types = {{ overlay_network_type }},vlan,flat,local
13
13
mechanism_drivers = openvswitch,l2population
14
14
 
15
15
[ml2_type_gre]