openstack
/
charm-neutron-gateway
Code Issues Proposed changes

fixed amulet test 

this PR adds hyperv mechanism driver back into the charm
This commit is contained in:
Gabriel Adrian Samfira 2015-09-14 17:30:47 +03:00
parent d15f4baef6
commit 4547c28081
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/juno/ml2_conf.ini
View File

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

2
tests/basic_deployment.py
View File

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