Fixes networking-bgpvpn pkg install

[apex.git] / build / overcloud-opendaylight.sh

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 0931968..f64e514 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 \
@@ -89,7 +81,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
     --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \
-    --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall python2-networking-bgpvpn && rm -rf /root/networking-bgpvpn*" \
+    --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall -y *.rpm && rm -rf /root/networking-bgpvpn*" \
+    --run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \
+    --run-command "touch /etc/neutron/networking_bgpvpn.conf" \
     -a overcloud-full-opendaylight_build.qcow2
 
 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2