[openstack-neutron/el6-icehouse] fix api-paste.ini reference

Pádraig Brady pbrady at fedoraproject.org
Sat Apr 19 01:59:31 UTC 2014


commit 7392b0105bc8ba925b3e76bbb70e5d1e5233ab01
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat Apr 19 02:57:18 2014 +0100

    fix api-paste.ini reference
    
    The DATADIR edit didn't make it into the package.
    Also it's best to avoid modifying sources in prep anyway,
    as that will result in edits to the git repo.

 neutron-dist.conf      |    2 +-
 openstack-neutron.spec |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/neutron-dist.conf b/neutron-dist.conf
index 5c6cb15..2ee56ab 100644
--- a/neutron-dist.conf
+++ b/neutron-dist.conf
@@ -3,7 +3,7 @@ verbose = True
 auth_strategy = noauth
 allow_overlapping_ips = True
 use_stderr = False
-api_paste_config = DATADIR/neutron/api-paste.ini
+api_paste_config = /usr/share/neutron/api-paste.ini
 
 [agent]
 root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 6166ddd..94b44ed 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -478,8 +478,6 @@ chmod 644 neutron/plugins/cisco/README
 # Let's handle dependencies ourseleves
 rm -f requirements.txt
 
-sed -i "s,DATADIR,%{_datadir}," %{SOURCE30}
-
 %build
 %{__python} setup.py build
 


More information about the scm-commits mailing list