[openstack-neutron] Removed signing_dir from neutron.conf (bz#1050842)
Ihar Hrachyshka
ihrachyshka at fedoraproject.org
Mon Apr 28 16:14:53 UTC 2014
commit e85e0d8a3643bad77a8eb0014ae68b2e9f741e50
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date: Mon Apr 28 18:14:06 2014 +0200
Removed signing_dir from neutron.conf (bz#1050842)
0003-Removed-signing_dir-from-neutron.conf.patch | 27 ++++++++++++++++++++++
openstack-neutron.spec | 7 +++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0003-Removed-signing_dir-from-neutron.conf.patch b/0003-Removed-signing_dir-from-neutron.conf.patch
new file mode 100644
index 0000000..4060f18
--- /dev/null
+++ b/0003-Removed-signing_dir-from-neutron.conf.patch
@@ -0,0 +1,27 @@
+From f8ad6b7a6cbec015fd64d1f6bdb35f4b9eb48f3f 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 775c757..e3ebf74 100644
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
+@@ -398,7 +398,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 de4990d..373b13b 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
Name: openstack-neutron
Version: 2014.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.4.b3
Summary: OpenStack Networking Service
@@ -34,6 +34,7 @@ Source30: neutron-dist.conf
#
Patch0001: 0001-remove-runtime-dependency-on-pbr.patch
Patch0002: 0002-Sync-service-and-systemd-modules-from-oslo-incubator.patch
+Patch0003: 0003-Removed-signing_dir-from-neutron.conf.patch
BuildArch: noarch
@@ -440,6 +441,7 @@ IPSec.
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
sed -i 's/RPMVERSION/%{version}/; s/RPMRELEASE/%{release}/' neutron/version.py
@@ -995,6 +997,9 @@ fi
%changelog
+* Mon Apr 28 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-13
+- Removed signing_dir from neutron.conf (bz#1050842)
+
* Wed Apr 23 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-12
- Removed obsolete setup scripts
More information about the scm-commits
mailing list