X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=943716bc69b620a18264be81c9e8a4b4fdc62a67;hb=83e3a718e26ca42465a03c7d70eb241e82e45e1e;hp=e7f1dd7d19fda462081ba7e26aa4f783c46988f4;hpb=3b37b935031b1db4a153eacb5019b0c3555486b1;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index e7f1dd7d..943716bc 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -46,10 +46,16 @@ pushd images > /dev/null
 
 dpdk_pkg_str=''
 for package in ${dpdk_rpms[@]}; do
-  curl -O "$dpdk_uri_base/$package"
+  wget "$dpdk_uri_base/$package"
   dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
 done
 
+fdio_pkg_str=''
+for package in ${fdio_pkgs[@]}; do
+  wget "$fdio_uri_base/$package"
+  fdio_pkg_str+=" --upload $package:/root/fdio"
+done
+
 # tar up the congress puppet module
 rm -rf puppet-congress
 git clone -b stable/mitaka https://github.com/radez/puppet-congress
@@ -105,7 +111,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --run-command "mkdir /root/dpdk_rpms" \
+    --run-command "mkdir /root/fdio" \
     $dpdk_pkg_str \
+    $fdio_pkg_str \
+    --upload ../networking-vpp.noarch.rpm:/root/fdio \
+    --run-command "yum install -y etcd" \
+    --run-command "pip install python-etcd" \
     --install "centos-release-qemu-ev" \
     --run-command "yum update -y" \
     --run-command "yum remove -y qemu-system-x86" \
@@ -118,10 +129,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
     --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
     --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
-    --upload ../vpp-bin.tar.gz:/root \
-    --run-command "cd /root && tar zxvf vpp-bin.tar.gz" \
-    --run-command "yum install -y /root/vpp-bin/*.rpm" \
-    --run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
+    --run-command "yum install -y /root/fdio/*.rpm" \
+    --run-command "tar zxvf /root/fdio/vpp_papi*.tar.gz -C /" \
     --install unzip \
     --upload puppet-fdio.tar.gz:/etc/puppet/modules \
     --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
@@ -135,6 +144,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
     --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
     --run-command "pip install python-senlinclient" \
+    --upload ../neutron/agent/interface/interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \
+    --run-command "mkdir /root/fdio_neutron_l3" \
+    --upload ../neutron/agent/l3/namespaces.py:/root/fdio_neutron_l3/ \
+    --upload ../neutron/agent/l3/router_info.py:/root/fdio_neutron_l3/ \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2