Merge pull request #33 from zulcss/master

Renamed binary to keystone-all.

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/keystone b/bin/keystone-all
index 5f75279b..7645a949 100755
--- a/bin/keystone
+++ b/bin/keystone-all
@@ -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-all',
                                '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
diff --git a/setup.py b/setup.py
index 5f52c702..127867a8 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-all', 'bin/keystone-manage'],
       zip_safe=False,
       install_requires=['setuptools', 'python-keystoneclient'],
       )