summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-17 12:53:11 -0400
committerTim Rozet <trozet@redhat.com>2016-08-17 14:55:30 -0400
commit295ee1a3ae66746088cb841b6f691a6817943c0e (patch)
tree63149bccf32d389eef84d4e1418e228432808c87
parent295f767df246efb71eb1bb394ae0f85654710699 (diff)
Adds fds networking-odl for ODL FDIO deployments
JIRA: APEX-133 Change-Id: I7d87f2e463921369cd002b768976fd9cc06c8a91 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rwxr-xr-xbuild/overcloud-opendaylight.sh8
-rwxr-xr-xlib/overcloud-deploy-functions.sh6
2 files changed, 14 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 3e403bbc..160c5e96 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -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]
@@ -43,6 +50,7 @@ wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahma
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
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 \
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index ef07ec0a..df17750b 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -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