From 71d192d50d8763c7e6940c0cb76b42aa81cfcbb7 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 8301eb9..7778e47 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
@@ -110,7 +109,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)
 
     monkeypatch_thread = not CONF.standard_threads
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()