Make neutron packages provide and obsolete quantum

Added provides and obsoletes for corresponding quantum packages to
neutron and neutronclient packages. This should ease updates from
grizzly where quantum is called quantum.

Partial-bug: #1198041
Change-Id: I93b810c3cd8b0acf54c174d1c2133c46f2cdfc77

conf/templates/packaging/specs/openstack-neutron.spec

@@ -61,6 +61,9 @@ BuildRequires:	dos2unix
 Requires:	python-neutron = %{epoch}:%{version}-%{release}
 Requires:       python-keystone
 
+Provides:       openstack-quantum = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum < %{epoch}:%{version}-%{release}
+
 %if ! 0%{?usr_only}
 Requires(post):   chkconfig
 Requires(postun): initscripts
@@ -83,6 +86,9 @@ capabilities (e.g., QoS, ACLs, network monitoring, etc.)
 Summary:	Neutron Python libraries
 Group:		Applications/System
 
+Provides:       python-quantum = %{epoch}:%{version}-%{release}
+Obsoletes:      python-quantum < %{epoch}:%{version}-%{release}
+
 Requires:	sudo
 #for $i in $requires
 Requires:	${i}
@@ -100,6 +106,9 @@ This package contains the neutron Python library.
 Summary:	Neutron Big Switch plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-bigswitch = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-bigswitch < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -116,6 +125,10 @@ Networks Controller.
 Summary:	Neutron Brocade plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-brocade = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-brocade < %{epoch}:%{version}-%{release}
+
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -131,6 +144,9 @@ networks using Brocade VCS switches running NOS.
 Summary:	Neutron Cisco plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-cisco = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-cisco < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 Requires:	python-configobj
 
@@ -147,6 +163,9 @@ networks using Cisco UCS and Nexus.
 Summary:	Neutron Hyper-V plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-hyperv = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-hyperv < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -162,6 +181,9 @@ networks using Microsoft Hyper-V.
 Summary:	Neutron linuxbridge plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-linuxbridge = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-linuxbridge < %{epoch}:%{version}-%{release}
+
 Requires:	bridge-utils
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 Requires:	python-pyudev
@@ -179,6 +201,10 @@ networks as VLANs using Linux bridging.
 Summary:	Neutron MidoNet plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-midonet = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-midonet < %{epoch}:%{version}-%{release}
+
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -194,6 +220,9 @@ networks using MidoNet from Midokura.
 Summary:	Neutron ML2 plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-ml2 = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-ml2 < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 Requires:       python-stevedore >= 0.9
 
@@ -209,6 +238,9 @@ This package includes the Modular Layer 2 (ml2) Neutron plugin.
 Summary:	Neutron Mellanox plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-mlnx = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-mlnx < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -225,6 +257,9 @@ HCA.
 Summary:	Neutron Nicira plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-nicira = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-nicira < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -240,6 +275,9 @@ networks using Nicira NVP.
 Summary:	Neutron openvswitch plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-openvswitch = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-openvswitch < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 Requires:	openvswitch
 
@@ -256,6 +294,9 @@ networks using Open vSwitch.
 Summary:	Neutron PLUMgrid plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-plumgrid = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-plumgrid < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -271,6 +312,9 @@ networks using the PLUMgrid platform.
 Summary:	Neutron Ryu plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-ryu = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-ryu < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -286,6 +330,9 @@ networks using the Ryu Network Operating System.
 Summary:	Neutron NEC plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-nec = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-nec < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 
@@ -301,6 +348,9 @@ networks using the NEC OpenFlow controller.
 Summary:	Neutron meta plugin
 Group:		Applications/System
 
+Provides:       openstack-quantum-metaplugin = %{epoch}:%{version}-%{release}
+Obsoletes:      openstack-quantum-metaplugin < %{epoch}:%{version}-%{release}
+
 Requires:	openstack-neutron = %{epoch}:%{version}-%{release}
 
 

conf/templates/packaging/specs/python-commonclient.spec

@@ -30,6 +30,11 @@ Source0:          %{name}-%{os_version}.tar.gz
 Patch$idx: $fn
 #end for
 
+#if $clientname == 'neutron'
+Provides:       python-quantumclient = %{epoch}:%{version}-%{release}
+Obsoletes:      python-quantumclient < %{epoch}:%{version}-%{release}
+#end if
+
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}
 
 BuildArch:        noarch