summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilly O'Mahony <billy.o.mahony@intel.com>2016-04-08 10:22:26 +0100
committerBilly O'Mahony <billy.o.mahony@intel.com>2016-04-11 13:30:25 +0000
commit9be3edaf948cc28c6e879fa71daf4927dd3ed0d4 (patch)
tree1af754e213b749fcad0da408cc7974de422d97f2
parent9ad9481eab750f610ee3d2f8eb3e385667ba9fad (diff)
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> (cherry picked from commit b5b4ea732e18c5450c663c6f84f289eb6acadf4b)
-rwxr-xr-xfuel-plugin-ovsnfv/deployment_scripts/puppet/modules/ovsdpdk/manifests/postinstall_ovs_dpdk.pp2
1 files changed, 1 insertions, 1 deletions
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}",