summaryrefslogtreecommitdiffstats
path: root/build/opnfv-apex.spec
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-22 08:25:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-22 08:25:33 +0000
commit2e2779549879b01c994f5e2685179f0d2ce319fc (patch)
tree97d1329ec63049b9bb34fc9c6690b7427147b8da /build/opnfv-apex.spec
parent9e8b5e9f68dde6c427d0617a7cf4b932a802b923 (diff)
parented90b347e4228477f419a1b483f3997639665fef (diff)
Merge "adding SFC overcloud image"
Diffstat (limited to 'build/opnfv-apex.spec')
-rw-r--r--build/opnfv-apex.spec8
1 files changed, 5 insertions, 3 deletions
diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index ebe87897..81b8d656 100644
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -11,7 +11,6 @@ Source0: opnfv-apex.tar.gz
Provides: opnfv-apex-sdn
BuildArch: noarch
Requires: opnfv-apex-common opnfv-apex-undercloud
-Conflicts: opnfv-apex-onos opnfv-apex-opencontrail
%description
Overcloud Disk images for OPNFV Apex OpenDaylight deployment
@@ -22,13 +21,16 @@ https://wiki.opnfv.org/apex
%install
mkdir -p %{buildroot}%{_var}/opt/opnfv/stack/
-install build/stack/overcloud-full.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
+install build/stack/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/stack/
%files
%defattr(644, root, root, -)
-%{_var}/opt/opnfv/stack/overcloud-full.qcow2
+%{_var}/opt/opnfv/stack/overcloud-full-opendaylight.qcow2
%changelog
+* 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