Attachment 941760 Details for Bug 1147084 – Removes the associated patches

[patch] Removes the associated patches

0002-remove-PBR-patches.patch (text/plain), 5.09 KB, created by Adam Young on 2014-09-27 02:09:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Young

Created: 2014-09-27 02:09:51 UTC

Size: 5.09 KB

patch

obsolete

>From 647e8b9e3914e9ac94ae181f435493a56344609c Mon Sep 17 00:00:00 2001
>From: Adam Young <ayoung@redhat.com>
>Date: Fri, 26 Sep 2014 22:08:26 -0400
>Subject: [PATCH 2/2] remove PBR patches
>
>---
> 0001-remove-runtime-dep-on-python-pbr.patch        | 52 ---------------
> ...-parameter-values-with-keystone-dist.conf.patch | 76 ----------------------
> 2 files changed, 128 deletions(-)
> delete mode 100644 0001-remove-runtime-dep-on-python-pbr.patch
> delete mode 100644 0002-sync-parameter-values-with-keystone-dist.conf.patch
>
>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 f2f8609..0000000
>--- a/0001-remove-runtime-dep-on-python-pbr.patch
>+++ /dev/null
>@@ -1,52 +0,0 @@
>-From 3837f8ccf791cae1f6abc10d20e0aa4ce99038f0 Mon Sep 17 00:00:00 2001
>-From: Alan Pevec <apevec@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 732ee8e..e548763 100755
>---- a/bin/keystone-all
>-+++ b/bin/keystone-all
>-@@ -21,7 +21,6 @@ import sys
>- 
>- from oslo import i18n
>- from paste import deploy
>--import pbr.version
>- 
>- 
>- # If ../keystone/__init__.py exists, add ../ to Python search path, so that
>-@@ -117,7 +116,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 e8c84af..140832d 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
>-@@ -285,7 +284,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 c6392fa..0000000
>--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
>+++ /dev/null
>@@ -1,76 +0,0 @@
>-From 21a7072cd41ce9f209a41d2b4e5786b8667ae293 Mon Sep 17 00:00:00 2001
>-From: Alan Pevec <apevec@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 9f6051b..f7f6a0e 100644
>---- a/etc/keystone.conf.sample
>-+++ b/etc/keystone.conf.sample
>-@@ -347,7 +347,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)
>-@@ -402,10 +402,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)
>-@@ -537,7 +538,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
>-@@ -587,7 +588,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)
>-@@ -680,7 +681,7 @@
>- #
>- 
>- # EC2Credential backend driver. (string value)
>--#driver=keystone.contrib.ec2.backends.kvs.Ec2
>-+#driver=keystone.contrib.ec2.backends.sql.Ec2
>- 
>- 
>- [endpoint_filter]
>-@@ -1241,7 +1242,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]
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1147084: 941719 | 941760 | 942551