Migrate to pbr.

Closes bug 1179007

Change-Id: I9d2a0190bb8dc31ea481909a4e0af3008aa976bf

CONTRIBUTING.rst

@@ -0,0 +1,17 @@
+If you would like to contribute to the development of OpenStack,
+you must follow the steps in the "If you're a developer, start here"
+section of this page:
+
+   http://wiki.openstack.org/HowToContribute
+
+Once those steps have been completed, changes to OpenStack
+should be submitted for review via the Gerrit tool, following
+the workflow documented at:
+
+   http://wiki.openstack.org/GerritWorkflow
+
+Pull requests submitted through GitHub will be ignored.
+
+Bugs should be filed on Launchpad, not GitHub:
+
+   https://bugs.launchpad.net/keystone

MANIFEST.in

@@ -1,6 +1,7 @@
 include AUTHORS
 include babel.cfg
 include ChangeLog
+include CONTRIBUTING.txt
 include LICENSE
 include HACKING.rst
 include README.rst

bin/keystone-all

@@ -19,13 +19,13 @@ if os.path.exists(os.path.join(possible_topdir,
 
 
 from paste import deploy
+import pbr.version
 
 from keystone import config
 from keystone.common import wsgi
 from keystone.common import wsgi_server
 from keystone.common import utils
 from keystone.openstack.common import importutils
-from keystone.openstack.common import version
 
 
 CONF = config.CONF
@@ -79,7 +79,7 @@ if __name__ == '__main__':
         config_files = [dev_conf]
 
     CONF(project='keystone',
-         version=version.VersionInfo('keystone').version_string(),
+         version=pbr.version.VersionInfo('keystone').version_string(),
          default_config_files=config_files)
 
     config.setup_logging(CONF)

keystone/cli.py

@@ -20,12 +20,12 @@
 import pwd
 
 from oslo.config import cfg
+import pbr.version
 
 from keystone.common import openssl
 from keystone import config
 from keystone.openstack.common import importutils
 from keystone.openstack.common import jsonutils
-from keystone.openstack.common import version
 from keystone import token
 
 CONF = config.CONF
@@ -204,7 +204,7 @@ def main(argv=None, config_files=None):
     CONF.register_cli_opt(command_opt)
     CONF(args=argv[1:],
          project='keystone',
-         version=version.VersionInfo('keystone').version_string(),
+         version=pbr.version.VersionInfo('keystone').version_string(),
          usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
          default_config_files=config_files)
     config.setup_logging(CONF)