summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-02-08 15:23:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-08 15:23:05 +0000
commit3c960945ebb7e25b73194436e67bf65c68acf791 (patch)
treefd1de693c4d2c60c4c7f027929d82ab2503df15e /lib/overcloud-deploy-functions.sh
parent3f3658db935f00413faf1390654ac56ed98fbf85 (diff)
parentc9c5d323915fb294d25767a890fd6e44d1c10e6c (diff)
Merge "Use RDO packaged networking-odl"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 7c83cc6b..347bd749 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -85,18 +85,7 @@ EOF
--run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \
-a overcloud-full.qcow2
- if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
- sudo sed -i '/FdioEnabled:/c\ FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
- LIBGUESTFS_BACKEND=direct virt-customize --run-command "cp -f /root/fdio_neutron_l3/namespaces.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
- --run-command "cp -f /root/fdio_neutron_l3/router_info.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \
- -a overcloud-full.qcow2
- if [ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]; then
- LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /root/ && tar zxvf networking-odl.tar.gz" \
- --run-command "cd /root/networking-odl && git init && pip install -r requirements.txt" \
- --run-command "cd /root/networking-odl && python setup.py build && python setup.py install" \
- -a overcloud-full.qcow2
- fi
- else
+ if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then
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" \