[openstack-neutron/el6-havana] Removed signing_dir from neutron.conf

[Ihar Hrachyshka]

commit 72168faabbac155ff386dde114c08e62eeffe764
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Mon Apr 28 18:07:34 2014 +0200

    Removed signing_dir from neutron.conf

 0004-Removed-signing_dir-from-neutron.conf.patch |   27 ++++++++++++++++++++++
 openstack-neutron.spec                           |    7 +++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0004-Removed-signing_dir-from-neutron.conf.patch b/0004-Removed-signing_dir-from-neutron.conf.patch
new file mode 100644
index 0000000..4c3514e
--- /dev/null
+++ b/0004-Removed-signing_dir-from-neutron.conf.patch
@@ -0,0 +1,27 @@
+From a648719bb4113a1c672efa03f8ae3cc9c4a4ea11 Mon Sep 17 00:00:00 2001
+From: Ihar Hrachyshka <ihrachys at redhat.com>
+Date: Mon, 28 Apr 2014 15:05:30 +0200
+Subject: [PATCH] Removed signing_dir from neutron.conf
+
+The default value from keystone middleware ($TMPDIR) is good enough,
+so stick to it.
+
+Closes-Bug: 1313780
+Change-Id: Ideb393f9010f4f1706392ccdfdd5fa7307bda070
+(cherry picked from commit e423126965fb79d35f5f2281974cee6a216af8d4)
+---
+ etc/neutron.conf | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/etc/neutron.conf b/etc/neutron.conf
+index 62e2488..e2c26c4 100644
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
+@@ -315,7 +315,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]
+ # This line MUST be changed to actually run the plugin.
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index ddd3778..e2cfbcf 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -57,6 +57,7 @@ Source90:	neutron-dist.conf
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Remove-dnsmasq-version-warning.patch
 Patch0003: 0003-Sync-service-and-systemd-modules-from-oslo-incubator.patch
+Patch0004: 0004-Removed-signing_dir-from-neutron.conf.patch
 
 BuildArch:	noarch
 
@@ -425,6 +426,7 @@ IPSec.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -1024,6 +1026,9 @@ fi
 
 
 %changelog
+* Mon Apr 28 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-4
+- Removed signing_dir from neutron.conf
+
 * Mon Apr 28 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-3
 - Sync service and systemd modules from oslo-incubator, bz#1063427