From 47ef4045c06e1aaa1cacbd9b1f193705187e5fc1 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 +--
 requirements.txt | 24 +-----------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/bin/keystone-all b/bin/keystone-all
index 3214d13..2e468be 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
 
 
 from paste import deploy
-import pbr.version
 
 from keystone.openstack.common import gettextutils
 # NOTE(dstanek): gettextutils.enable_lazy() must be called before
@@ -102,7 +101,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 a9decbd..9411219 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.common import openssl
 from keystone.common import sql
@@ -184,7 +183,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/requirements.txt b/requirements.txt
index 31b98ea..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,24 +1,2 @@
 # keystone dependencies
-pbr>=0.6,!=0.7,<1.0
-WebOb>=1.2.3
-eventlet>=0.13.0
-greenlet>=0.3.2
-netaddr>=0.7.6
-PasteDeploy>=1.5.0
-Paste
-Routes>=1.12.3
-six>=1.6.0
-SQLAlchemy>=0.7.8,<=0.9.99
-sqlalchemy-migrate>=0.9.1
-passlib
-lxml>=2.3
-iso8601>=0.1.9
-python-keystoneclient>=0.9.0
-oslo.config>=1.2.0
-oslo.messaging>=1.3.0
-Babel>=1.3
-oauthlib>=0.6
-dogpile.cache>=0.5.3
-jsonschema>=2.0.0,<3.0.0
-pycadf>=0.5.1
-posix_ipc
+# let RPM handle deps