diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-apex-common.spec | 9 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 13 |
2 files changed, 18 insertions, 4 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index db795f84..958cb14a 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -8,10 +8,11 @@ License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-common.tar.gz -BuildArch: noarch -BuildRequires: python-docutils python34-devel -Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 +BuildArch: noarch +BuildRequires: python-docutils python34-devel +Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 +Requires: ipxe-roms-qemu >= 20160127-1 %description Scripts for OPNFV deployment using RDO Manager diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index fe67c287..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='' @@ -45,6 +53,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 |