Fix versioning code

Removed cruft from OpenStack common versioning code that was removed.
Added optional git SHA information if module is available. The
intent is to have the additional git revision reported only when FINAL
is set to False.

Change-Id: Iae94b84027e7428cd394726e07845d2bad631586
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 72b1d9568..4503489e0 100755
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,12 @@ import setuptools
 
 from heat.openstack.common import setup
 
-# import this after write_vcsversion because version imports vcsversion
 from heat import version
+version.write_git_sha()
 
 setuptools.setup(
     name='heat',
-    version=version.canonical_version_string(),
+    version=version.HEAT_VERSION,
     description='The heat project provides services for provisioning '
                 'virtual machines',
     license='Apache License (2.0)',