openstack/charm-neutron-gateway
Code Issues Proposed changes

Re-enable hyperv mechanism driver

Browse Source
This commit is contained in:
James Page 2015-09-16 13:05:04 +01:00
commit 1634bc89d0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/ml2_conf.ini
View File

@ -5,7 +5,7 @@
[ml2] [ml2]
type_drivers = gre,vxlan,vlan,flat type_drivers = gre,vxlan,vlan,flat
tenant_network_types = gre,vxlan,vlan,flat tenant_network_types = gre,vxlan,vlan,flat
mechanism_drivers = openvswitch,l2population mechanism_drivers = openvswitch,hyperv,l2population
[ml2_type_gre] [ml2_type_gre]
tunnel_id_ranges = 1:1000 tunnel_id_ranges = 1:1000

2
templates/juno/ml2_conf.ini
View File

@ -5,7 +5,7 @@
[ml2] [ml2]
type_drivers = gre,vxlan,vlan,flat type_drivers = gre,vxlan,vlan,flat
tenant_network_types = gre,vxlan,vlan,flat tenant_network_types = gre,vxlan,vlan,flat
mechanism_drivers = openvswitch,l2population mechanism_drivers = openvswitch,hyperv,l2population
[ml2_type_gre] [ml2_type_gre]
tunnel_id_ranges = 1:1000 tunnel_id_ranges = 1:1000

2
tests/basic_deployment.py
View File

@ -399,7 +399,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'ml2': { 'ml2': {
'type_drivers': 'gre,vxlan,vlan,flat', 'type_drivers': 'gre,vxlan,vlan,flat',
'tenant_network_types': 'gre,vxlan,vlan,flat', 'tenant_network_types': 'gre,vxlan,vlan,flat',
'mechanism_drivers': 'openvswitch,l2population' 'mechanism_drivers': 'openvswitch,hyperv,l2population'
}, },
'ml2_type_gre': { 'ml2_type_gre': {
'tunnel_id_ranges': '1:1000' 'tunnel_id_ranges': '1:1000'