Merge "Makefile & build.sh updates for RPM Building"

[apex.git] / build / opnfv-apex.spec

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index fb01061..acc8a53 100644 (file)
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -1,40 +1,61 @@
 Name:          opnfv-apex
-Version:       2.0
-Release:       1
-Summary:       RDO Manager disk images for deployment
+Version:       3.0
+Release:       %{release}
+Summary:       Overcloud Disk images for OPNFV Apex OpenDaylight deployment
 
 Group:         System Environment
 License:       Apache 2.0
 URL:           https://gerrit.opnfv.org/gerrit/apex.git
 Source0:       opnfv-apex.tar.gz
 
-#BuildRequires:
-#Requires:
+Provides:       opnfv-apex-sdn
+BuildArch:     noarch
+Requires:      opnfv-apex-common opnfv-apex-undercloud
 
 %description
-These files are disk images used to launch the instack
-libvirt VM and to load into the instack undercloud machine
-to deploy an OpenStack overcloud.
+Overcloud Disk images for OPNFV Apex OpenDaylight deployment
+https://wiki.opnfv.org/apex
 
 %prep
 %setup -q
 
-
-%build
-
 %install
-mkdir -p %{buildroot}/usr/bin/
-cp ci/deploy.sh %{buildroot}/usr/bin/
-
-mkdir -p %{buildroot}/var/lib/libvirt/images/
-cp build/instack.qcow2 %{buildroot}/var/lib/libvirt/images/
+mkdir -p %{buildroot}%{_var}/opt/opnfv/images/
+install build/images/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
 
 %files
-/usr/bin/deploy.sh
-/var/lib/libvirt/images/instack.qcow2
+%defattr(644, root, root, -)
+%{_var}/opt/opnfv/images/overcloud-full-opendaylight.qcow2
 
 %changelog
-* Fri Sep 25 2015 Dan Radez <dradez@redhatcom> - 2.0-1
+* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
+- Version update for Colorado
+* Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-4
+- cleaning out libvirt config files
+- replacing instack-virt-setup with direct tripleo calls
+* Tue Jan 19 2016 Dan Radez <dradez@redhat.com> - 2.1-3
+- Remove conflicts with other SDN controllers, they can co-exist now
+- update overcloud image name to specify opendaylight
+* Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-2
+- Package Split
+* Wed Jan 13 2016 Dan Radez <dradez@redhat.com> - 2.1-1
+- Incrementing Minor for Bramaputra RC release
+* Sun Dec 20 2015 Tim Rozet <trozet@redhat.com> - 2.0-8
+- Modifies networks to include OPNFV private/storage networks
+* Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.0-7
+- Added deploy settings for flat network config
+- cleaned up files that don't need to be in the rpm
+* Wed Dec 09 2015 Dan Radez <dradez@redhat.com> - 2.0-6
+- Updating the OpenDaylight Patch
+* Sat Dec 05 2015 Dan Radez <dradez@redhat.com> - 2.0-5
+- Removing glance images
+* Fri Nov 20 2015 Dan Radez <dradez@redhat.com> - 2.0-4
+- Adding documentation
+* Thu Nov 12 2015 Dan Radez <dradez@redhat.com> - 2.0-3
+- OpenDaylight and Network Isolation support
+* Wed Oct 21 2015 Dan Radez <dradez@redhat.com> - 2.0-2
+- Initial deployment success using RPM packaging
+* Fri Sep 25 2015 Dan Radez <dradez@redhat.com> - 2.0-1
 - Migrated to RDO Manager
-* Fri Apr 24 2015 Dan Radez <dradez@redhatcom> - 0.1-1
+* Fri Apr 24 2015 Dan Radez <dradez@redhat.com> - 0.1-1
 - Initial Packaging