Merge "Add PBR generation of version information"

doc/conf.py

@@ -39,6 +39,17 @@ master_doc = 'index'
 project = u'kolla'
 copyright = u'2013, OpenStack Foundation'
 
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+from kolla.version import version_info as kolla_version
+# The full version, including alpha/beta/rc tags.
+release = kolla_version.version_string_with_vcs()
+# The short X.Y version.
+version = kolla_version.canonical_version_string()
+
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
 

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)

setup.cfg

@@ -1,6 +1,5 @@
 [metadata]
 name = kolla
-version = 2.0.0
 summary = Kolla OpenStack Deployment
 description-file =
     README.rst