From ce5c8417b21c931939612846c4565a1ba2857a2d Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Thu, 3 Sep 2015 13:56:27 +0300 Subject: [PATCH 1/3] Added the Hyper-V mechanism driver to ml2_conf.ini --- templates/juno/ml2_conf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/juno/ml2_conf.ini b/templates/juno/ml2_conf.ini index 4c1dfa9d..f6f8ced6 100644 --- a/templates/juno/ml2_conf.ini +++ b/templates/juno/ml2_conf.ini @@ -5,7 +5,7 @@ [ml2] type_drivers = gre,vxlan,vlan,flat tenant_network_types = gre,vxlan,vlan,flat -mechanism_drivers = openvswitch,l2population +mechanism_drivers = openvswitch,l2population,hyperv [ml2_type_gre] tunnel_id_ranges = 1:1000 From 639b34a94b8a53d173cb3d82f9da0ed1a2cdd265 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Mon, 14 Sep 2015 17:30:47 +0300 Subject: [PATCH 2/3] fixed amulet test this PR adds hyperv mechanism driver back into the charm --- templates/juno/ml2_conf.ini | 2 +- tests/basic_deployment.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/juno/ml2_conf.ini b/templates/juno/ml2_conf.ini index f6f8ced6..adf8f6c8 100644 --- a/templates/juno/ml2_conf.ini +++ b/templates/juno/ml2_conf.ini @@ -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 diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 9f9f59ce..9232beef 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -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' From 748e9ee87466196be80135c7ab09a17aa0d8f603 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Mon, 14 Sep 2015 18:07:45 +0300 Subject: [PATCH 3/3] add hyperv to icehouse ml2_config.ini --- templates/icehouse/ml2_conf.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini index c9c04982..1d8dec75 100644 --- a/templates/icehouse/ml2_conf.ini +++ b/templates/icehouse/ml2_conf.ini @@ -5,7 +5,7 @@ [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