From 9be3edaf948cc28c6e879fa71daf4927dd3ed0d4 Mon Sep 17 00:00:00 2001 From: Billy O'Mahony Date: Fri, 8 Apr 2016 10:22:26 +0100 Subject: fuel plugin: Fix mechanism driver config This fixes the yardstick ping test. And hopefully other y/s tests. Add ovs to the mechanism driver search list so that neutron agent continues to work with the kernel ovs on the non-compute nodes. This enables the router on the control node and makes VMs accessible via public ip addresses. Change-Id: Ife08e63e8bf9358cc24eb610b3d7611484b3151f Signed-off-by: Billy O'Mahony Reviewed-by: Jonas Bjurel Reviewed-by: Mark D. Gray Reviewed-by: Tom Herbert Reviewed-by: Michal Skalski Reviewed-by: Stefan Berg (cherry picked from commit b5b4ea732e18c5450c663c6f84f289eb6acadf4b) --- .../puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp index 315a3c1..95b4272 100755 --- a/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp +++ b/fuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp @@ -149,7 +149,7 @@ CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFil # common part exec {'adapt_ml2_conf_mechanism_driver': - command => "sudo crudini --set ${ml2_conf} ml2 mechanism_drivers ovsdpdk", + command => "sudo crudini --set ${ml2_conf} ml2 mechanism_drivers ovsdpdk,openvswitch", path => ['/usr/bin','/bin'], user => root, onlyif => "test -f ${ml2_conf}", -- cgit 1.2.3-korg