From 7f91aa8d349b6bc1110d4389f457957542b69626 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 | 20 +-------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/bin/keystone-all b/bin/keystone-all
index beec3df..1e6aecb 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
 
@@ -95,7 +94,7 @@ if __name__ == '__main__':
         config_files = [dev_conf]
 
     CONF(project='keystone',
-         version=pbr.version.VersionInfo('keystone').version_string(),
+         version='REDHATKEYSTONEVERSION',
          default_config_files=config_files)
 
     config.setup_logging(CONF, product_name='keystone')
diff --git a/keystone/cli.py b/keystone/cli.py
index af2c2dc..4fd99cf 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -21,7 +21,6 @@ import os
 from migrate import exceptions
 
 from oslo.config import cfg
-import pbr.version
 
 from keystone.common import openssl
 from keystone.common.sql import migration
@@ -212,7 +211,7 @@ def main(argv=None, config_files=None):
     CONF.register_cli_opt(command_opt)
     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(CONF)
diff --git a/requirements.txt b/requirements.txt
index aba4dea..e975d85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,2 @@
 # keystone dependencies
-pbr>=0.5.21,<1.0
-pam>=0.1.4
-WebOb>=1.2.3,<1.3
-eventlet>=0.13.0
-greenlet>=0.3.2
-netaddr
-PasteDeploy>=1.5.0
-Paste
-Routes>=1.12.3
-SQLAlchemy>=0.7.8,<=0.7.99
-sqlalchemy-migrate>=0.7.2
-passlib
-lxml>=2.3
-iso8601>=0.1.8
-python-keystoneclient>=0.3.2
-oslo.config>=1.2.0
-Babel>=1.3
-oauth2
-dogpile.cache>=0.5.0
+# let RPM handle deps