diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-14 15:39:26 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-06-14 16:52:53 -0400 |
| commit | de1e3ecb39655a5ae0f39db09f4f143c721de5e4 (patch) | |
| tree | 80f131322ce11a076baba340cdd2e7c7855af555 | |
| parent | 8963743396666507109ee4922a541f0dc164b796 (diff) | |
Allows nic mapping to set hieradata variables
Currently os-net-config figures out the mapping of logical nic names,
such as "nic1" to a physical nic on the overcloud node. This mapping is
not exposed to THT. This patch allows the mapping to be placed in a
hieradata file that can be access by THT during the deployment.
JIRA: APEX-119
opnfv-tht-pr: 28
Change-Id: I7ec631fe2a04ce6193b72b2e56eb34a24a4507e1
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | build/overcloud-full.sh | 10 |
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 |