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 (executable)
--- 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}",