diff options
| -rw-r--r-- | build/Makefile | 1 | ||||
| -rw-r--r-- | build/opnfv-apex-undercloud.spec | 8 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 |
3 files changed, 5 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 <trozet@redhat.com> - 3.0-1 +* Tue May 24 2016 Tim Rozet <trozet@redhat.com> - 3.0-1 - Adds jinja2 nic templates * Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0 - Version update for Colorado diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 2dcbe81c..a63d491d 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -9,3 +9,4 @@ 25,Force metadata on all scenarios 26,Fixes ODL ML2 IP 30,Adds OVS DPDK config +33,Removes QOS service plugin from Neutron |