From ec89d4ec9ae5428fe3509c5155d66efedb8a6668 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 1 Feb 2012 13:35:59 -0500 Subject: [PATCH] Change the name of keystone to keystone-server so the binaries dont conflict with python-keystoneclient. Signed-off-by: Chuck Short --- bin/{keystone => keystone-server} | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename bin/{keystone => keystone-server} (97%) diff --git a/bin/keystone b/bin/keystone-server similarity index 97% rename from bin/keystone rename to bin/keystone-server index 5f75279baf..d30d9c6192 100755 --- a/bin/keystone +++ b/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) diff --git a/setup.py b/setup.py index 5f52c70252..fa5c3bea6d 100755 --- a/setup.py +++ b/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'], )