Merge "remove os-net-config before trying to clone it"

[apex.git] / build / overcloud-full.sh

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index fe67c28..340053b 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -28,6 +28,15 @@ 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
 
 dpdk_pkg_str=''
@@ -45,6 +54,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
     --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