From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Fri, 8 Apr 2016 09:22:26 +0000 (+0100)
Subject: fuel plugin: Fix mechanism driver config
X-Git-Tag: colorado.1.0~30
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=ovsnfv.git;a=commitdiff_plain;h=b5b4ea732e18c5450c663c6f84f289eb6acadf4b

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 <billy.o.mahony@intel.com>
Reviewed-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Reviewed-by: Mark D. Gray <mark.d.gray@intel.com>
Reviewed-by: Tom Herbert <therbert@redhat.com>
Reviewed-by: Michal Skalski <mskalski@mirantis.com>
Reviewed-by: Stefan Berg <stefan.k.berg@ericsson.com>
---

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}",