X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=340053b329a2730d37131fec38c2f513d6ca1bd8;hb=85759538077aad6e3c2e87ac7a6be5a2f1fb8803;hp=d0ee3f010499f8ba83ea47f18dc4bb28e5c52433;hpb=5fec80057dbd799d52a4c1ff2f35a1c8cc5ad6ea;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index d0ee3f01..340053b3 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -10,6 +10,7 @@
 set -e
 source ./cache.sh
 source ./variables.sh
+source ./functions.sh
 
 populate_cache "$rdo_images_uri/overcloud-full.tar"
 
@@ -21,20 +22,43 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
 #####  Prep initial overcloud image with common deps #####
 ##########################################################
 
+# prep opnfv-puppet-tripleo for undercloud
+clone_fork opnfv-puppet-tripleo
+pushd opnfv-puppet-tripleo > /dev/null
+git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar.gz
+popd > /dev/null
+
+# download customized os-net-config
+rm -fr os-net-config
+git clone https://github.com/trozet/os-net-config.git -b hiera_nic_mapping
+pushd os-net-config > /dev/null
+pushd os_net_config > /dev/null
+git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz
+popd > /dev/null
+popd > /dev/null
+
 pushd images > /dev/null
 
-# remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV
+dpdk_pkg_str=''
+for package in ${dpdk_rpms[@]}; do
+  curl -O "$dpdk_uri_base/$package"
+  dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
+done
+
+# installing forked opnfv-puppet-tripleo
 # enable connection tracking for protocal sctp
+# upload dpdk rpms but do not install
 LIBGUESTFS_BACKEND=direct virt-customize \
+    --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
+    --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" \
-    -a overcloud-full_build.qcow2
-
-###################################
-#####  Add CPU pinning script #####
-###################################
-
-LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload ../setkernelparam.sh:/root \
+    --run-command "mkdir /root/dpdk_rpms" \
+    $dpdk_pkg_str \
+    --install "centos-release-qemu-ev" \
+    --run-command "yum update -y" \
+    --run-command "yum remove -y qemu-system-x86" \
+    --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
+    --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2