aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-23 12:33:03 +0000
committerGerrit Code Review <review@openstack.org>2016-03-23 12:33:03 +0000
commita3a43e7b926f716daed24156d3db64ee5f9846e3 (patch)
treeb5a5db59b2420deda9397998b5f2f205cea6094a /kolla
parent91599cf646ebb844c815aae9113571a62d5f3cbb (diff)
parent31634c4df4cff1a8fb0eae46404114c370cb4102 (diff)
downloadkolla-a3a43e7b926f716daed24156d3db64ee5f9846e3.tar.gz
kolla-a3a43e7b926f716daed24156d3db64ee5f9846e3.zip
Merge "Add PBR generation of version information"
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 6d4d7108b..b9ab56b3e 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -15,7 +15,7 @@ import itertools
from oslo_config import cfg
from oslo_config import types
-from kolla import version
+from kolla.version import version_info as version
RDO_MIRROR = "http://trunk.rdoproject.org/centos7"
@@ -125,7 +125,7 @@ _CLI_OPTS = [
help=('The number of threads to use while building.'
' (Note: setting to one will allow real time'
' logging.)')),
- cfg.StrOpt('tag', default=version.version_info.cached_version_string(),
+ cfg.StrOpt('tag', default=version.cached_version_string(),
deprecated_group='kolla-build',
help='The Docker tag'),
cfg.BoolOpt('template-only', default=False,
@@ -284,5 +284,5 @@ def parse(conf, args, usage=None, prog=None,
project='kolla',
usage=usage,
prog=prog,
- version=version.version_info.cached_version_string(),
+ version=version.cached_version_string(),
default_config_files=default_config_files)