From 592edf4aac41985d4f802f8ee607af9171c516ed Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 9 Dec 2015 15:52:38 -0500 Subject: updating the OpenDaylight patch - using the proposed patched for upstream - ensuring l3_ha is disabled - exposing support for an ODL only node Change-Id: I6f4a50300ea08322eea4ba466fc1a3b0fbcb5743 Signed-off-by: Dan Radez --- build/opnfv-apex.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'build/opnfv-apex.spec') diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index c1e3504c..88ec6425 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -1,5 +1,5 @@ Name: opnfv-apex -Version: 2.4 +Version: 2.5 Release: %{release} Summary: RDO Manager disk images for deployment @@ -42,8 +42,8 @@ install build/default-pool.xml %{buildroot}%{_var}/opt/opnfv/ install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ install build/nics/controller.yaml %{buildroot}%{_var}/opt/opnfv/nics/ install build/nics/compute.yaml %{buildroot}%{_var}/opt/opnfv/nics/ -install build/opendaylight.yaml %{buildroot}%{_var}/opt/opnfv/ -install build/opendaylight.patch %{buildroot}%{_var}/opt/opnfv/ +install build/opendaylight-puppet-neutron.patch %{buildroot}%{_var}/opt/opnfv/ +install build/opendaylight-tripleo-heat-templates.patch %{buildroot}%{_var}/opt/opnfv/ install build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/ install build/instackenv.json.example %{buildroot}%{_var}/opt/opnfv/ @@ -68,8 +68,8 @@ install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/network-environment.yaml %{_var}/opt/opnfv/nics/controller.yaml %{_var}/opt/opnfv/nics/compute.yaml -%{_var}/opt/opnfv/opendaylight.yaml -%{_var}/opt/opnfv/opendaylight.patch +%{_var}/opt/opnfv/opendaylight-puppet-neutron.patch +%{_var}/opt/opnfv/opendaylight-tripleo-heat-templates.patch %{_var}/opt/opnfv/instackenv-virt.json %{_var}/opt/opnfv/instackenv.json.example %{_var}/opt/opnfv/stack/overcloud-full.qcow2 @@ -81,6 +81,8 @@ install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ %changelog +* Wed Dec 09 2015 Dan Radez - 2.5-1 +- Updating the OpenDaylight Patch * Fri Dec 05 2015 Dan Radez - 2.4-1 - Removing glance images * Fri Nov 20 2015 Dan Radez - 2.3-1 -- cgit 1.2.3-korg