Skip to content

Commit

Permalink
keystone commands don't print any version information
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Davanum Srinivas authored and dolph committed Mar 22, 2013
1 parent 9ed8be3 commit a088e8c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion bin/keystone-all
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions keystone/cli.py
Expand Up @@ -25,6 +25,7 @@
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

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit a088e8c

Please sign in to comment.