Use RDO packaged networking-odl

We currently use networking-odl package from opnfv fds repo, this
is no longer needed as networking-odl is packaged in RDO.

Change-Id: Ie9301cd627ab5131d4cd698dd7e4ef435d8e59c0
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 0931968..94417d1 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -18,13 +18,6 @@ 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 ${BUILD_DIR}/networking-odl.tar.gz networking-odl
-popd > /dev/null
-
 # Beryllium Repo
 cat > ${BUILD_DIR}/opendaylight.repo << EOF
 [opendaylight-4-release]
@@ -76,7 +69,6 @@ tar czf networking-bgpvpn.tar.gz networking-bgpvpn/
 # Patch in OPNFV custom puppet-tripleO
 # install Honeycomb
 LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ${BUILD_DIR}/networking-odl.tar.gz:/root/ \
     --upload ${BUILD_DIR}/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
     --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
     --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 7c83cc6..347bd74 100755 (executable)
--- 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" \