[openstack-neutron/el6-havana] Replace quantum references in neutron-dist.conf

[Terry Wilson]

commit 3a57f497d6ecd77c30832b666c7c2b026861e6bc
Author: Terry Wilson <twilson at redhat.com>
Date:   Mon Dec 2 17:40:07 2013 -0600

    Replace quantum references in neutron-dist.conf
    
    Resolves: bz#1036514
    
    Conflicts:
    	openstack-neutron.spec

 neutron-dist.conf      |    4 ++--
 openstack-neutron.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/neutron-dist.conf b/neutron-dist.conf
index 9b1a635..a4a55c8 100644
--- a/neutron-dist.conf
+++ b/neutron-dist.conf
@@ -3,13 +3,13 @@ verbose = True
 lock_path = $state_path/lock
 auth_strategy = noauth
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
-rpc_backend = quantum.openstack.common.rpc.impl_qpid
+rpc_backend = neutron.openstack.common.rpc.impl_qpid
 allow_overlapping_ips = True
 
 [quotas]
 
 [agent]
-root_helper = sudo quantum-rootwrap /etc/quantum/rootwrap.conf
+root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
 
 [keystone_authtoken]
 auth_host = 127.0.0.1
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 9a62ecd..3536742 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -999,6 +999,9 @@ fi
 
 
 %changelog
+* Mon Dec 02 2013 Terry Wilson <twilson at redhat.com> - 2013.2-10
+- Replace quantum references in neutron-dist.conf
+
 * Tue Nov 19 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-9
 - Fix dependency on parallel installed python-jinja2-26