Change the name of keystone to keystone-server so

the binaries dont conflict with python-keystoneclient.

Signed-off-by: Chuck Short <chuck.short@canonical.com>

bin/keystone-server

@@ -12,7 +12,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
                                    os.pardir,
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir,
-                               'keystone',
+                               'keystone-server',
                                '__init__.py')):
     sys.path.insert(0, possible_topdir)
 

setup.py

@@ -9,7 +9,7 @@ setup(name='keystone',
       author_email='openstack@lists.launchpad.net',
       url='http://www.openstack.org',
       packages=find_packages(exclude=['test', 'bin']),
-      scripts=['bin/keystone', 'bin/keystone-manage'],
+      scripts=['bin/keystone-server', 'bin/keystone-manage'],
       zip_safe=False,
       install_requires=['setuptools', 'python-keystoneclient'],
       )