X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fopnfv-apex.spec;h=a34e3e7ae5c7cd1fe1f8434d5f9a68dfb2cb9394;hb=refs%2Fchanges%2F07%2F12307%2F1;hp=23d4abc1f61706acefd08ca1c608ef3059f7a75d;hpb=24e05320bd6be675c0043f659d988c751f34f302;p=apex.git

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index 23d4abc1..a34e3e7a 100644
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -1,69 +1,58 @@
 Name:		opnfv-apex
-Version:	2.0
+Version:	2.2
 Release:	%{release}
-Summary:	RDO Manager disk images for deployment
+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
 
+Provides:       opnfv-apex-sdn
 BuildArch:	noarch
-BuildRequires:	openvswitch libvirt qemu-kvm
-Requires:	openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools
+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}%{_bindir}/
-cp ci/deploy.sh %{buildroot}%{_bindir}/
-
 mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/
-
-cp build/instack.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/instack.xml %{buildroot}%{_var}/opt/opnfv/
-cp build/baremetalbrbm_0.xml %{buildroot}%{_var}/opt/opnfv/
-cp build/baremetalbrbm_1.xml %{buildroot}%{_var}/opt/opnfv/
-cp build/brbm.xml %{buildroot}%{_var}/opt/opnfv/
-
-cp build/instackenv-virt.json %{buildroot}%{_var}/opt/opnfv/
-cp build/stack/deploy-ramdisk-ironic.initramfs %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/deploy-ramdisk-ironic.kernel %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/ironic-python-agent.initramfs %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/ironic-python-agent.kernel %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/ironic-python-agent.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
-cp build/stack/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/stack/
+install build/stack/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
 
 %files
-%{_bindir}/deploy.sh
-%{_var}/opt/opnfv/stack/instack.qcow2
-%{_var}/opt/opnfv/instack.xml
-%{_var}/opt/opnfv/baremetalbrbm_0.xml
-%{_var}/opt/opnfv/baremetalbrbm_1.xml
-%{_var}/opt/opnfv/brbm.xml
-%{_var}/opt/opnfv/instackenv-virt.json
-%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.initramfs
-%{_var}/opt/opnfv/stack/deploy-ramdisk-ironic.kernel
-%{_var}/opt/opnfv/stack/ironic-python-agent.initramfs
-%{_var}/opt/opnfv/stack/ironic-python-agent.kernel
-%{_var}/opt/opnfv/stack/ironic-python-agent.vmlinuz
-%{_var}/opt/opnfv/stack/overcloud-full.initrd
-%{_var}/opt/opnfv/stack/overcloud-full.qcow2
-%{_var}/opt/opnfv/stack/overcloud-full.vmlinuz
+%defattr(644, root, root, -)
+%{_var}/opt/opnfv/stack/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> - 2.2-0
+- Brahmaputra SR1
+* 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