[openstack-nova/el6] Fix rpc_control_exchange regression

[Nikola Dipanov]

commit 62bdaa0b143bbe3546c2896841ee1086480436cf
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Tue Dec 4 10:02:15 2012 +0100

    Fix rpc_control_exchange regression

 0002-Fix-rpc-control_exchange-regression.patch |   34 ++++++++++++++++++++++++
 openstack-nova.spec                            |    9 +++++-
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/0002-Fix-rpc-control_exchange-regression.patch b/0002-Fix-rpc-control_exchange-regression.patch
new file mode 100644
index 0000000..d2ece14
--- /dev/null
+++ b/0002-Fix-rpc-control_exchange-regression.patch
@@ -0,0 +1,34 @@
+From 0643b985787991e84c257beaf823da1e53e14755 Mon Sep 17 00:00:00 2001
+From: Russell Bryant <rbryant at redhat.com>
+Date: Fri, 30 Nov 2012 16:08:52 -0500
+Subject: [PATCH] Fix rpc control_exchange regression.
+
+A change was made in rpc that requires project's to define the
+control_exchange option themselves.  This was so the project's could
+set their own default value.  This change has made it in to nova without
+adding the control_exchange option, meaning that it is using the default
+of 'openstack', potentially conflicting with other projects.
+
+See https://review.openstack.org/#/c/12518/
+
+Fix bug 1083944.
+
+Change-Id: Ifc00a537c4ee327cbee91fe1d911f8c402e350b7
+---
+ nova/flags.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/nova/flags.py b/nova/flags.py
+index 20ae652..7b8c841 100644
+--- a/nova/flags.py
++++ b/nova/flags.py
+@@ -425,6 +425,9 @@ global_opts = [
+                    'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, '
+                    'fake.FakeDriver, baremetal.BareMetalDriver, '
+                    'vmwareapi.VMWareESXDriver'),
++    cfg.StrOpt('control_exchange',
++               default='nova',
++               help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
+ ]
+ 
+ FLAGS.register_opts(global_opts)
diff --git a/openstack-nova.spec b/openstack-nova.spec
index b59bbc7..305e615 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2012.2.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -44,6 +44,7 @@ Source22:         nova-ifc-template
 # patches_base=2012.2.1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch0002: 0002-Fix-rpc-control_exchange-regression.patch
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-nova-newdeps.patch
@@ -360,6 +361,7 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 # Apply EPEL patch
 %patch100 -p1
@@ -753,7 +755,10 @@ fi
 %endif
 
 %changelog
-* Thu Sep 27 2012 Nikola Đipanov <ndipanov at redhat.com> - 2012.2.1-1
+* Tue Dec 04 2012 Nikola Đipanov <ndipanov at redhat.com> - 2012.2.1-2
+= Fix rpc_control_exchange regression
+
+* Fri Nov 30 2012 Nikola Đipanov <ndipanov at redhat.com> - 2012.2.1-1
 - Update to folsom stable release 1
 
 * Tue Oct 30 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-2