Commit 3b37b935 authored by Tim Rozet's avatar Tim Rozet Committed by Gerrit Code Review
Browse files

Merge "Adds fds networking-odl for ODL FDIO deployments"

parents db42501d 295ee1a3
......@@ -18,6 +18,13 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2
##### Adding OpenDaylight to overcloud #####
###############################################
# tar up fdio networking-odl
rm -rf fds
git clone https://gerrit.opnfv.org/gerrit/fds
pushd fds > /dev/null
tar -czvf ../networking-odl.tar.gz networking-odl
popd > /dev/null
# Beryllium Repo
cat > /tmp/opendaylight.repo << EOF
[opendaylight-4-release]
......@@ -52,6 +59,7 @@ popd > /dev/null
# install Honeycomb
# install Honeycomb puppet module
LIBGUESTFS_BACKEND=direct virt-customize \
--upload networking-odl.tar.gz:/root/ \
--upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
--run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
--upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
......
......@@ -94,6 +94,12 @@ EOF
if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
sudo sed -i '/FdioEnabled:/c\ FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
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
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \
-a overcloud-full.qcow2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment