X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Fovercloud-full.sh;h=0984a923f1e0b0ca492482be77c8e30c35606d47;hb=16ab950af532de3f618f26ff9fbfdf4ca3244f5c;hp=636ac596376a3bc7c7cc00fbdcbda67926dbe3b1;hpb=5ed8715821281129b89f6c959463dccc1ec5641a;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 636ac596..0984a923 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
@@ -58,21 +64,13 @@ git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-
 popd > /dev/null
 
 # create fd.io yum repo file
-cat > /tmp/fdio-master.repo << EOF
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
-enabled=1
-gpgcheck=0
-EOF
-
-cat > /tmp/tacker.repo << EOF
-[tacker-trozet]
-name=Tacker RPMs built from https://github.com/trozet/ tacker repositories
-baseurl=http://radez.fedorapeople.org/tacker/
-enabled=1
-gpgcheck=0
-EOF
+#cat > /tmp/fdio-master.repo << EOF
+#[fdio-master]
+#name=fd.io master branch latest merge
+#baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+#enabled=1
+#gpgcheck=0
+#EOF
 
 # tar up the fd.io module
 rm -rf puppet-fdio
@@ -104,7 +102,6 @@ popd > /dev/null
 # install fd.io yum repo and packages
 # upload puppet fdio
 # git clone vsperf into the overcloud image
-# upload tacker repo and install the packages
 # upload the tacker puppet module and untar it
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
@@ -114,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" \
@@ -127,20 +129,17 @@ 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 /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \
-    --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 /" \
-    --install unzip,honeycomb \
+    --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" \
     --upload vsperf.tar.gz:/var/opt \
     --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \
-    --upload /tmp/tacker.repo:/etc/yum.repos.d/ \
-    --install "python-tackerclient" \
-    --upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \
-    --install /root/openstack-tacker-2015.2-1.noarch.rpm \
+    --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
+    --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
     --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
     --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" \