X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Fopnfv-apex.spec;h=81b8d65699ba57e8649c9aa8948ca9e5c2b360a4;hb=beafa30495ff06b565a68d6a2771c9116edf7e9f;hp=0bc663be13c4af742862f37e379e1d37ade432ca;hpb=5928e7a63e9bea9a002b5be66535ec45e3b9b1a2;p=apex.git diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec index 0bc663be..81b8d656 100644 --- a/build/opnfv-apex.spec +++ b/build/opnfv-apex.spec @@ -1,78 +1,56 @@ Name: opnfv-apex -Version: 2.0 -Release: 1 -Summary: RDO Manager disk images for deployment +Version: 2.1 +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}%{_bindir}/ -cp ci/deploy.sh %{buildroot}%{_bindir}/ - -mkdir -p %{buildroot}%{_sharedstatedir}/libvirt/images/ -cp build/instack.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/ -cp build/baremetalbrbm_0.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/ -cp build/baremetalbrbm_1.qcow2 %{buildroot}%{_sharedstatedir}/libvirt/images/ - -mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/ -cp build/instack.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/ -cp build/baremetalbrbm_0.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/ -cp build/baremetalbrbm_1.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/ - -mkdir -p %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/ -cp build/brbm.xml %{buildroot}%{_sysconfdir}/libvirt/qemu/networks/ - mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/ -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}/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/ -cp build/stack/fedora-user.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ +install build/stack/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/ %files -%{_bindir}/deploy.sh -%{_sharedstatedir}/libvirt/images/instack.qcow2 -%{_sharedstatedir}/libvirt/images/baremetalbrbm_0.qcow2 -%{_sharedstatedir}/libvirt/images/baremetalbrbm_1.qcow2 -%{_sysconfdir}/libvirt/qemu/instack.xml -%{_sysconfdir}/libvirt/qemu/baremetalbrbm_0.xml -%{_sysconfdir}/libvirt/qemu/baremetalbrbm_1.xml -%{_sysconfdir}/libvirt/qemu/networks/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 -%{_var}/opt/opnfv/stack/fedora-user.qcow2 +%defattr(644, root, root, -) +%{_var}/opt/opnfv/stack/overcloud-full-opendaylight.qcow2 %changelog -* Fri Sep 25 2015 Dan Radez - 2.0-1 +* Tue Jan 19 2016 Dan Radez - 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 - 2.1-2 +- Package Split +* Wed Jan 13 2016 Dan Radez - 2.1-1 +- Incrementing Minor for Bramaputra RC release +* Sun Dec 20 2015 Tim Rozet - 2.0-8 +- Modifies networks to include OPNFV private/storage networks +* Tue Dec 15 2015 Dan Radez - 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 - 2.0-6 +- Updating the OpenDaylight Patch +* Sat Dec 05 2015 Dan Radez - 2.0-5 +- Removing glance images +* Fri Nov 20 2015 Dan Radez - 2.0-4 +- Adding documentation +* Thu Nov 12 2015 Dan Radez - 2.0-3 +- OpenDaylight and Network Isolation support +* Wed Oct 21 2015 Dan Radez - 2.0-2 +- Initial deployment success using RPM packaging +* Fri Sep 25 2015 Dan Radez - 2.0-1 - Migrated to RDO Manager -* Fri Apr 24 2015 Dan Radez - 0.1-1 +* Fri Apr 24 2015 Dan Radez - 0.1-1 - Initial Packaging