1 files changed, 4 insertions, 34 deletions
diff --git a/setup.py b/setup.py
index 6d7cecb70..2ccece789 100644
--- a/setup.py
+++ b/setup.py
@@ -24,44 +24,14 @@ from setuptools.command.sdist import sdist
 from sphinx.setup_command import BuildDoc
 
 from nova.utils import parse_mailmap, str_dict_replace
+from nova import version
 
-NOVA_VERSION = ['2011', '1']
-
-VERSIONFILE_DEFAULT_VCS_VERSION = """
-version_info = {"branch_nick": "LOCALBRANCH", "revision_id": "LOCALREVISION"}
-"""
-
-VERSIONFILE_DATA = """
-# below this line automatically generated by setup.py
-
-YEAR = %r
-COUNT = %r
-""" % (NOVA_VERSION[0], NOVA_VERSION[1])
-
-
-VERSIONFILE_DATA += """
-
-def string():
-    return '.'.join([YEAR, COUNT])
-
-
-def vcs_version_string():
-    return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
-
-
-def string_with_vcs():
-    return "%s-%s" % (string(), vcs_version_string())
-"""
-
-with open("nova/version.py", 'w') as version_file:
-    if os.path.isdir('.bzr'):
+if os.path.isdir('.bzr'):
+    with open("nova/vcsversion.py", 'w') as version_file:
         vcs_cmd = subprocess.Popen(["bzr", "version-info", "--python"],
                                    stdout=subprocess.PIPE)
         vcsversion = vcs_cmd.communicate()[0]
         version_file.write(vcsversion)
-    else:
-        version_file.write(VERSIONFILE_DEFAULT_VCS_VERSION)
-    version_file.write(VERSIONFILE_DATA)
 
 
 class local_BuildDoc(BuildDoc):
@@ -88,7 +58,7 @@ class local_sdist(sdist):
         sdist.run(self)
 
 setup(name='nova',
-      version='2011.1',
+      version=version.canonical_version(),
       description='cloud computing fabric controller',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',