summaryrefslogtreecommitdiff
path: root/nova/config.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-03-12 13:02:09 +0000
committerMark McLoughlin <markmc@redhat.com>2013-03-12 13:02:09 +0000
commit01627ff0bf522deb8c2a838724f88cd2506ca626 (patch)
tree74719ab1174eb43b0407b28c4b537994a59b621e /nova/config.py
parent562b0787421b145c4a91ccbbcacfc74c340cead8 (diff)
downloadnova-01627ff0bf522deb8c2a838724f88cd2506ca626.tar.gz
Fix nova-manage --version
Fixes bug #1138844 Pass the version kwarg to cfg.CONF() so that --version shows the version number. Change-Id: I589ebffec67ef00f8ba24f553bf3e81806aa50b6
Diffstat (limited to 'nova/config.py')
-rw-r--r--nova/config.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/config.py b/nova/config.py
index ff6681b44c..636045ecda 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -22,6 +22,7 @@ from oslo.config import cfg
from nova.openstack.common.db.sqlalchemy import session as db_session
from nova.openstack.common import rpc
from nova import paths
+from nova import version
_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('$sqlite_db')
@@ -32,4 +33,5 @@ def parse_args(argv, default_config_files=None):
rpc.set_defaults(control_exchange='nova')
cfg.CONF(argv[1:],
project='nova',
+ version=version.version_string(),
default_config_files=default_config_files)