X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Fovercloud-full.sh;h=e1c58001304cc340e4d821ac71bffde73f7c6662;hb=refs%2Fchanges%2F21%2F35421%2F5;hp=dbf297fd608ab9410a6ebdee8c31e1724c373b86;hpb=c056642b88365a0b328aa7646cbd9bdb3ae35fc1;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index dbf297fd..e1c58001 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -75,25 +75,26 @@ pushd puppet-ovn > /dev/null
 git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz
 popd > /dev/null
 
-# Master FD.IO Repo
-cat > ${BUILD_DIR}/fdio.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
-
 # Get Real Time Kernel from kvm4nfv
 populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm
 
-# ODL/FDIO packages frozen for L2 scenarios
-fdio_l2_pkg_str=''
-for package in ${fdio_l2_pkgs[@]}; do
-  wget "$fdio_l2_uri_base/$package"
-  fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/"
+# packages frozen for fdio scenarios
+fdio_pkg_str=''
+for package in ${fdio_pkgs[@]}; do
+  wget "$package"
+  fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/"
 done
 
+# tosca parser
+rm -rf tosca-parser
+git clone https://github.com/openstack/tosca-parser
+tar czf tosca-parser.tar.gz tosca-parser
+
+# heat translator
+rm -rf heat-translator
+git clone https://github.com/openstack/heat-translator
+tar czf heat-translator.tar.gz heat-translator
+
 # Increase disk size by 900MB to accommodate more packages
 qemu-img resize overcloud-full_build.qcow2 +900MB
 
@@ -117,12 +118,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
     --run-command "mkdir /root/dpdk_rpms" \
-    --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \
     $dpdk_pkg_str \
-    --run-command "mkdir /root/fdio_l2" \
-    --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \
-    $fdio_l2_pkg_str \
-    --run-command "yum install -y /root/fdio_l2/*.rpm" \
+    --run-command "mkdir /root/fdio" \
+    --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \
+    $fdio_pkg_str \
+    --run-command "yum install -y /root/fdio/*.rpm" \
     --run-command "yum install -y etcd" \
     --install python-etcd \
     --run-command "puppet module install cristifalcas/etcd" \
@@ -149,6 +149,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install /root/$tacker_pkg \
     --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \
     --install /root/$tackerclient_pkg \
+    --upload ${BUILD_DIR}/tosca-parser.tar.gz:/root/ \
+    --run-command "cd /root/ && tar xzf tosca-parser.tar.gz" \
+    --run-command "cd /root/tosca-parser && python setup.py build && python setup.py install" \
+    --upload ${BUILD_DIR}/heat-translator.tar.gz:/root/ \
+    --run-command "cd /root/ && tar xzf heat-translator.tar.gz" \
+    --run-command "cd /root/heat-translator && python setup.py build && python setup.py install" \
     --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \
     --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \
@@ -156,11 +162,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \
     --run-command "pip install python-senlinclient" \
     --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \
-    --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \
-    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 <  puppet-neutron-add-odl-settings.patch" \
     --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \
     --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2.patch:/usr/share/openstack-puppet/modules/neutron/ \
     --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 <  puppet-neutron-vpp-ml2.patch" \
+    --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \
+    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 <  puppet-neutron-vpp-ml2-type_drivers-setting.patch" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2