openstack/keystone
Code Issues Proposed changes

Merge "keystone commands don't print any version information"

Browse Source
This commit is contained in:
Jenkins 2013-03-26 15:23:55 +00:00 committed by Gerrit Code Review
commit 4561612cce
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 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)

2
keystone/cli.py
View File

@ -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)