Fix wget failures in fuel@opnfv

Change-Id: Ie95dc77f267a385adfe87cb32952d8861a515934
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
This commit is contained in:
Guo Ruijing 2016-06-21 02:44:52 +08:00
parent bee1b2b540
commit f04f64e8b3
2 changed files with 8 additions and 5 deletions

View File

@ -12,7 +12,7 @@ dpdk=$3
if [ $nsh = 'true' ]
then
wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-nsh/
curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-nsh-dpdk.tar.gz | tar -xzv
dpkg -i openvswitch-datapath-dkms_2.5.90-1.nsh_all.deb
dpkg -i openvswitch-common_2.5.90-1.nsh_amd64.deb
dpkg -i openvswitch-switch_2.5.90-1.nsh_amd64.deb
@ -25,7 +25,7 @@ then
dpkg -i openvswitch-switch-dpdk_2.5.90-1.nsh_amd64.deb
fi
else
wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/
curl http://$host:8080/plugins/fuel-plugin-ovs-0.9/repositories/ubuntu/ovs-dpdk.tar.gz | tar -xzv
dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
dpkg -i openvswitch-common_2.5.90-1_amd64.deb
dpkg -i openvswitch-switch_2.5.90-1_amd64.deb

View File

@ -13,12 +13,15 @@ function build_pkg {
cd ${DIR}/ovs_build
sudo docker build -t ovs_build .
rm -rf ${DIR}/ovs-dpdk; mkdir -p ${DIR}/ovs-dpdk/; chmod 777 ${DIR}/ovs-dpdk
sudo docker run -v ${DIR}/ovs-dpdk:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
sudo docker run -v ${DIR}/deb:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .; cd ..
rm -rf ${DIR}/ovs-nsh; mkdir -p ${DIR}/ovs-nsh/; chmod 777 ${DIR}/ovs-nsh
rm -rf ${DIR}/deb; mkdir -p ${DIR}/deb; chmod 777 ${DIR}/deb; cd ${DIR}/deb
sudo docker run -v ${DIR}/ovs-nsh:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .; cd ..
rm -rf ${DIR}/deb;
;;
*) echo "Not supported system"; exit 1;;
esac