summaryrefslogtreecommitdiffstats
path: root/build/overcloud-full.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-06-15 14:28:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-15 14:28:21 +0000
commitac70d7441e0f17a857226678d14b4985a21df6b2 (patch)
treeca230bb6992ceef307a1fe158c0451ec3d79b036 /build/overcloud-full.sh
parent26a9a4efc45539338fb8c239b110b3341d0e4910 (diff)
parentde1e3ecb39655a5ae0f39db09f4f143c721de5e4 (diff)
Merge "Allows nic mapping to set hieradata variables"
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-xbuild/overcloud-full.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 106b4871..1a8d8461 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -28,6 +28,14 @@ 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
+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=''
@@ -48,6 +56,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--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