apevec pushed to openstack-keystone (master). "cleanup: drop unused patches (..more)"

[notifications at fedoraproject.org]

>From 10c3f96d16dd4efe979abe4b5a8b0b76a0361eec Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Thu, 2 Apr 2015 21:42:09 +0200
Subject: cleanup: drop unused patches

Change-Id: I3633ef6a6c4dac35cbb3433a65d6c88db22e3b93

diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
deleted file mode 100644
index 81859eb..0000000
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a6d91d2b26428b3886775ab769137a7903236254 Mon Sep 17 00:00:00 2001
-From: Alan Pevec <apevec at redhat.com>
-Date: Mon, 9 Sep 2013 00:38:42 +0200
-Subject: [PATCH] remove runtime dep on python-pbr
-
----
- bin/keystone-all | 3 +--
- keystone/cli.py  | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/bin/keystone-all b/bin/keystone-all
-index 89e5128..90f6f8e 100755
---- a/bin/keystone-all
-+++ b/bin/keystone-all
-@@ -20,7 +20,6 @@ import socket
- import sys
- 
- from oslo import i18n
--import pbr.version
- 
- 
- # If ../keystone/__init__.py exists, add ../ to Python search path, so that
-@@ -127,7 +126,7 @@ if __name__ == '__main__':
-     config.set_default_for_default_log_levels()
- 
-     CONF(project='keystone',
--         version=pbr.version.VersionInfo('keystone').version_string(),
-+         version='REDHATKEYSTONEVERSION',
-          default_config_files=config_files)
- 
-     config.setup_logging()
-diff --git a/keystone/cli.py b/keystone/cli.py
-index 4cc20eb..50d7880 100644
---- a/keystone/cli.py
-+++ b/keystone/cli.py
-@@ -17,7 +17,6 @@ from __future__ import absolute_import
- import os
- 
- from oslo.config import cfg
--import pbr.version
- 
- from keystone import assignment
- from keystone.common import openssl
-@@ -300,7 +299,7 @@ def main(argv=None, config_files=None):
- 
-     CONF(args=argv[1:],
-          project='keystone',
--         version=pbr.version.VersionInfo('keystone').version_string(),
-+         version='REDHATKEYSTONEVERSION',
-          usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
-          default_config_files=config_files)
-     config.setup_logging()
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
deleted file mode 100644
index 5e2506f..0000000
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 962819b22ea07f1442a85b0ee34354062241dd0d Mon Sep 17 00:00:00 2001
-From: Alan Pevec <apevec at redhat.com>
-Date: Mon, 9 Sep 2013 15:22:20 +0200
-Subject: [PATCH] sync parameter values with keystone-dist.conf
-
-and adjust descriptions to take dist.conf defaults into account (rhbz#923912)
-
-Change-Id: If36c384f86843a6506a494d79beca65639fb3480
----
- etc/keystone.conf.sample | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
-index c058a03..6ef183e 100644
---- a/etc/keystone.conf.sample
-+++ b/etc/keystone.conf.sample
-@@ -353,7 +353,7 @@
- #verbose=false
- 
- # Log output to standard error. (boolean value)
--#use_stderr=true
-+#use_stderr=false
- 
- # Format string to use for log messages with context. (string
- # value)
-@@ -408,10 +408,11 @@
- # %(default)s . (string value)
- #log_date_format=%Y-%m-%d %H:%M:%S
- 
--# (Optional) Name of log file to output to. If no default is
--# set, logging will go to stdout. (string value)
-+# (Optional) Name of log file to output to. (string value)
-+# If not set here, logging will go to /var/log/keystone/keystone.log,
-+# default from keystone-dist.conf.
- # Deprecated group/name - [DEFAULT]/logfile
--#log_file=<None>
-+#log_file=/var/log/keystone/keystone.log
- 
- # (Optional) The base directory used for relative --log-file
- # paths. (string value)
-@@ -572,7 +573,7 @@
- 
- # Catalog template file name for use with the template catalog
- # backend. (string value)
--#template_file=default_catalog.templates
-+#template_file=/etc/keystone/default_catalog.templates
- 
- # Catalog backend driver. (string value)
- #driver=keystone.catalog.backends.sql.Catalog
-@@ -629,7 +630,7 @@
- # Deprecated group/name - [DEFAULT]/sql_connection
- # Deprecated group/name - [DATABASE]/sql_connection
- # Deprecated group/name - [sql]/connection
--#connection=<None>
-+#connection=mysql://keystone:keystone@localhost/keystone
- 
- # The SQLAlchemy connection string to use to connect to the
- # slave database. (string value)
-@@ -722,7 +723,7 @@
- #
- 
- # EC2Credential backend driver. (string value)
--#driver=keystone.contrib.ec2.backends.kvs.Ec2
-+#driver=keystone.contrib.ec2.backends.sql.Ec2
- 
- 
- [endpoint_filter]
-@@ -1307,7 +1308,7 @@
- 
- # Name of the paste configuration file that defines the
- # available pipelines. (string value)
--#config_file=keystone-paste.ini
-+#config_file=/usr/share/keystone/keystone-dist-paste.ini
- 
- 
- [policy]
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-keystone.git/commit/?h=master&id=10c3f96d16dd4efe979abe4b5a8b0b76a0361eec