[openstack-neutron/f21] Removed service_providers from neutron-dist.conf, rhbz#1022725

[Ihar Hrachyshka]

commit 958a5ed5a84bfa548500779ba4b9b599bc73514d
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Tue Sep 30 17:21:54 2014 +0200

    Removed service_providers from neutron-dist.conf, rhbz#1022725
    
    Resolves: rhbz#1022725

 neutron-dist.conf      |    4 ----
 openstack-neutron.spec |    5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/neutron-dist.conf b/neutron-dist.conf
index 4ac781f..5c3f01f 100644
--- a/neutron-dist.conf
+++ b/neutron-dist.conf
@@ -27,7 +27,3 @@ admin_password = %SERVICE_PASSWORD%
 max_pool_size = 10
 max_overflow = 20
 pool_timeout = 10
-
-[service_providers]
-service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
-
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 8c2eadd..8eb339f 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -1227,6 +1227,9 @@ fi
 
 
 %changelog
+* Fri Oct 03 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.3-2
+- Removed service_providers from neutron-dist.conf, rhbz#1022725
+
 * Fri Oct 03 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1.3-1
 - Update to upstream 2014.1.3