Update RPM specs to v. 2014.1.1

[openstack-build/neutron-build.git] / rpm / SOURCES / neutron-dist.conf

diff --git a/rpm/SOURCES/neutron-dist.conf b/rpm/SOURCES/neutron-dist.conf
index 9b1a6358ca51bbd4eecd1cd130948b077242cc02..17882aca825bd51e6832121b71b56b38b35190ee 100644 (file)
--- a/rpm/SOURCES/neutron-dist.conf
+++ b/rpm/SOURCES/neutron-dist.conf
@@ -3,13 +3,14 @@ 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
 allow_overlapping_ips = True
+use_stderr = False
+api_paste_config = /usr/share/neutron/api-paste.ini
 
 [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
@@ -18,7 +19,6 @@ auth_protocol = http
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%
-signing_dir = $state_path/keystone-signing
 
 [database]
 max_pool_size = 10
@@ -27,3 +27,4 @@ pool_timeout = 10
 
 [service_providers]
 service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+