From 4c98a1614a08ee5103d4591b7cce7731feb65742 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 28 Jun 2016 16:04:45 -0400 Subject: ISO missing ipxe roms package JIRA: APEX-157 Change-Id: I5feeec1472f58f1747054d7bb04c20274653594c Signed-off-by: Dan Radez --- build/Makefile | 1 + build/opnfv-apex-undercloud.spec | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Makefile b/build/Makefile index f599f42f..0763d361 100644 --- a/build/Makefile +++ b/build/Makefile @@ -264,6 +264,7 @@ iso: iso-clean images rpms $(CENTISO) cd centos/Packages && yumdownloader python34-libs cd centos/Packages && yumdownloader python34-yaml cd centos/Packages && yumdownloader python34-setuptools + cd centos/Packages && yumdownloader ipxe-roms-qemu cd centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm cd centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm # regenerate yum repo data diff --git a/build/opnfv-apex-undercloud.spec b/build/opnfv-apex-undercloud.spec index 55e152ff..7b688b55 100644 --- a/build/opnfv-apex-undercloud.spec +++ b/build/opnfv-apex-undercloud.spec @@ -25,19 +25,17 @@ mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/ install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ -install build/nics-controller.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ -install build/nics-compute.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ +install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ %files %defattr(644, root, root, -) %{_var}/opt/opnfv/images/undercloud.qcow2 %{_var}/opt/opnfv/network-environment.yaml -%{_var}/opt/opnfv/nics-controller.yaml.jinja2 -%{_var}/opt/opnfv/nics-compute.yaml.jinja2 +%{_var}/opt/opnfv/nics-template.yaml.jinja2 %changelog -* Thu May 24 2016 Tim Rozet - 3.0-1 +* Tue May 24 2016 Tim Rozet - 3.0-1 - Adds jinja2 nic templates * Mon Apr 04 2016 Dan Radez - 3.0-0 - Version update for Colorado -- cgit 1.2.3-korg