← Back to branch summary

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

« back to all changes in this revision

Viewing changes to templates/icehouse/ml2_conf.ini

  • Committer: James Page
  • Date: 2015-09-09 08:37:26 UTC
  • mto: This revision was merged to the branch mainline in revision 140.
  • Revision ID: james.page@ubuntu.com-20150909083726-2318wxwdz2keleyf
Add local driver and tenant_network_type to ml2 configurations

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/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,hyperv,l2population
14
14
 
15
15
[ml2_type_gre]