openstack/keystone
Code Issues Proposed changes

keystone commands don't print any version information

Browse Source 
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
This commit is contained in:
Davanum Srinivas 2013-03-13 17:16:20 -04:00 committed by Dolph Mathews
parent 9ed8be339f
commit a088e8c772
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/keystone-all
View File

@ -25,6 +25,7 @@ from keystone import config
from keystone.common import wsgi from keystone.common import wsgi
from keystone.common import utils from keystone.common import utils
from keystone.openstack.common import importutils from keystone.openstack.common import importutils
from keystone.openstack.common import version
CONF = config.CONF CONF = config.CONF
@ -77,7 +78,9 @@ if __name__ == '__main__':
if os.path.exists(dev_conf): if os.path.exists(dev_conf):
config_files = [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) config.setup_logging(CONF)

2
keystone/cli.py
View File

@ -25,6 +25,7 @@ from keystone.common import openssl
from keystone import config from keystone import config
from keystone.openstack.common import importutils from keystone.openstack.common import importutils
from keystone.openstack.common import jsonutils from keystone.openstack.common import jsonutils
from keystone.openstack.common import version
CONF = config.CONF CONF = config.CONF
@ -167,6 +168,7 @@ def main(argv=None, config_files=None):
CONF.register_cli_opt(command_opt) CONF.register_cli_opt(command_opt)
CONF(args=argv[1:], CONF(args=argv[1:],
project='keystone', project='keystone',
version=version.VersionInfo('keystone').version_string(),
usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']', usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
default_config_files=config_files) default_config_files=config_files)
config.setup_logging(CONF) config.setup_logging(CONF)