From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Mon, 11 Apr 2016 16:19:18 +0000 (+0000)
Subject: Merge "fuel plugin: Pick updated pcre packages." into stable/brahmaputra
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=456f72770de91a7489962d962efc823d3d5ceec8;hp=5506b7a619f60fe9f58d12901c12c6aaf0bb4773;p=ovsnfv.git

Merge "fuel plugin: Pick updated pcre packages." into stable/brahmaputra
---

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