openstack/charm-neutron-api
Code Issues Proposed changes

Align drivers and network types with configured overlay network types

Browse Source
This commit is contained in:
James Page 2015-05-07 09:43:26 +01:00
parent 39306764b3
commit 84ea219947
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

@ -4,8 +4,8 @@
# Configuration file maintained by Juju. Local changes may be overwritten. # Configuration file maintained by Juju. Local changes may be overwritten.
############################################################################### ###############################################################################
[ml2] [ml2]
type_drivers = gre,vxlan,vlan,flat type_drivers = {{ overlay_network_type }},vlan,flat
tenant_network_types = gre,vxlan,vlan,flat tenant_network_types = {{ overlay_network_type }},vlan,flat
mechanism_drivers = openvswitch,hyperv,l2population mechanism_drivers = openvswitch,hyperv,l2population
[ml2_type_gre] [ml2_type_gre]

4
templates/kilo/ml2_conf.ini
View File

@ -4,8 +4,8 @@
# Configuration file maintained by Juju. Local changes may be overwritten. # Configuration file maintained by Juju. Local changes may be overwritten.
############################################################################### ###############################################################################
[ml2] [ml2]
type_drivers = gre,vxlan,vlan,flat type_drivers = {{ overlay_network_type }},vlan,flat
tenant_network_types = gre,vxlan,vlan,flat tenant_network_types = {{ overlay_network_type }},vlan,flat
mechanism_drivers = openvswitch,l2population mechanism_drivers = openvswitch,l2population
[ml2_type_gre] [ml2_type_gre]