summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-09-27 01:05:37 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-27 01:05:37 +0000
commitfdcadb59d666e277d91629ed75705b4636a8749c (patch)
tree2e824cbca4a94c3e537c34556ee75ce1a874beec
parent8d6e0e73023eeaeef681880bad87a5ea8044bc73 (diff)
parent19dbb9f0e9c580fbd27af1175ea87dacc175db19 (diff)
Merge "enable vhostuser for ovs-dpdk scenario"
-rwxr-xr-xlib/overcloud-deploy-functions.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index c7301fdd..60d5e140 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -110,7 +110,11 @@ EOF
-a overcloud-full.qcow2
fi
else
+ sudo sed -i '/NeutronOVSDataPathType:/c\ NeutronOVSDataPathType: netdev' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \
+ --run-command "sed -i '/RuntimeDirectoryMode=.*/d' /usr/lib/systemd/system/openvswitch-nonetwork.service" \
+ --run-command "printf \"%s\\n\" RuntimeDirectoryMode=0775 Group=qemu UMask=0002 >> /usr/lib/systemd/system/openvswitch-nonetwork.service" \
+ --run-command "sed -i 's/\\(^\\s\\+\\)\\(start_daemon "$OVS_VSWITCHD_PRIORITY"\\)/\\1umask 0002 \\&\\& \\2/' /usr/share/openvswitch/scripts/ovs-ctl" \
-a overcloud-full.qcow2
fi
EOI