[openstack-neutron] Fixed neutron-server startup due to duplicate options

[Ihar Hrachyshka]

commit 3b79b47b82ed7e539a5f83d5c969b0ef66df8e10
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Fri May 16 15:17:33 2014 +0200

    Fixed neutron-server startup due to duplicate options

 neutron-dist.conf      |    3 +--
 openstack-neutron.spec |    5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/neutron-dist.conf b/neutron-dist.conf
index df3eac2..17882ac 100644
--- a/neutron-dist.conf
+++ b/neutron-dist.conf
@@ -26,6 +26,5 @@ max_overflow = 20
 pool_timeout = 10
 
 [service_providers]
-service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
-service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
+service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
 
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 32a89d8..4ca63e5 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -998,6 +998,9 @@ fi
 
 
 %changelog
+* Fri May 16 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-16
+- Fixed neutron-server startup due to duplicate options
+
 * Thu May 15 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-15
 - Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121