summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-05-11 14:54:56 -0400
committerMonty Taylor <mordred@inaugust.com>2013-05-23 16:59:08 +0200
commit444af9db83b4fab394440249da993d2cdd208229 (patch)
treec1f62bb614798b43f488d7a524f18540481f22af /bin
parentd6fb11c1b7938a8e72690e05ea6d118df053c98d (diff)
downloadkeystone-444af9db83b4fab394440249da993d2cdd208229.tar.gz
keystone-444af9db83b4fab394440249da993d2cdd208229.tar.xz
keystone-444af9db83b4fab394440249da993d2cdd208229.zip
Migrate to pbr.
Closes bug 1179007 Change-Id: I9d2a0190bb8dc31ea481909a4e0af3008aa976bf
Diffstat (limited to 'bin')
-rwxr-xr-xbin/keystone-all4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/keystone-all b/bin/keystone-all
index ff3143bd..03b4f95a 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -19,13 +19,13 @@ if os.path.exists(os.path.join(possible_topdir,
from paste import deploy
+import pbr.version
from keystone import config
from keystone.common import wsgi
from keystone.common import wsgi_server
from keystone.common import utils
from keystone.openstack.common import importutils
-from keystone.openstack.common import version
CONF = config.CONF
@@ -79,7 +79,7 @@ if __name__ == '__main__':
config_files = [dev_conf]
CONF(project='keystone',
- version=version.VersionInfo('keystone').version_string(),
+ version=pbr.version.VersionInfo('keystone').version_string(),
default_config_files=config_files)
config.setup_logging(CONF)