From a088e8c772197942a7801c90438ebf79bda33c61 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 13 Mar 2013 17:16:20 -0400 Subject: [PATCH] keystone commands don't print any version information keystone-manage --version and keystone-all --version do not show any version information. using the commons version mechanism to set the version number Fixes bug 1158783 Change-Id: Iade685a060cad8d9b3f2b80089d52faade43aba8 --- bin/keystone-all | 5 ++++- keystone/cli.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/keystone-all b/bin/keystone-all index 6a4e7c95d5..2fdc8c7aa2 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -25,6 +25,7 @@ from keystone import config from keystone.common import wsgi from keystone.common import utils from keystone.openstack.common import importutils +from keystone.openstack.common import version CONF = config.CONF @@ -77,7 +78,9 @@ if __name__ == '__main__': if os.path.exists(dev_conf): config_files = [dev_conf] - CONF(project='keystone', default_config_files=config_files) + CONF(project='keystone', + version=version.VersionInfo('keystone').version_string(), + default_config_files=config_files) config.setup_logging(CONF) diff --git a/keystone/cli.py b/keystone/cli.py index 6410d7b8cc..fc9d30445f 100644 --- a/keystone/cli.py +++ b/keystone/cli.py @@ -25,6 +25,7 @@ from keystone.common import openssl from keystone import config from keystone.openstack.common import importutils from keystone.openstack.common import jsonutils +from keystone.openstack.common import version CONF = config.CONF @@ -167,6 +168,7 @@ def main(argv=None, config_files=None): CONF.register_cli_opt(command_opt) CONF(args=argv[1:], project='keystone', + version=version.VersionInfo('keystone').version_string(), usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']', default_config_files=config_files) config.setup_logging(CONF)