From ec89d4ec9ae5428fe3509c5155d66efedb8a6668 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Wed, 1 Feb 2012 13:35:59 -0500
Subject: 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        | 71 -----------------------------------------------------
 bin/keystone-server | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py            |  2 +-
 3 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100755 bin/keystone
 create mode 100755 bin/keystone-server

diff --git a/bin/keystone b/bin/keystone
deleted file mode 100755
index 5f75279b..00000000
--- a/bin/keystone
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-import greenlet
-import logging
-import os
-import sys
-
-# If ../../keystone/__init__.py exists, add ../ to Python search path, so that
-# it will override what happens to be installed in /usr/(local/)lib/python...
-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',
-                               '__init__.py')):
-    sys.path.insert(0, possible_topdir)
-
-from paste import deploy
-
-from keystone import config
-from keystone.common import wsgi
-
-
-CONF = config.CONF
-
-
-def create_server(conf, name, port):
-    app = deploy.loadapp('config:%s' % conf, name=name)
-    return wsgi.Server(app, port)
-
-
-def serve(*servers):
-    for server in servers:
-        logging.debug("starting server %s on port %s", server.application,
-                                                       server.port)
-        server.start()
-
-    for server in servers:
-        try:
-            server.wait()
-        except greenlet.GreenletExit:
-            pass
-
-
-if __name__ == '__main__':
-    dev_conf = os.path.join(possible_topdir,
-                                'etc',
-                                'keystone.conf')
-    config_files = None
-    if os.path.exists(dev_conf):
-        config_files = [dev_conf]
-
-    CONF(config_files=config_files)
-
-    config.setup_logging(CONF)
-
-    # Log the options used when starting if we're in debug mode...
-    if CONF.debug:
-        CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG)
-
-    options = deploy.appconfig('config:%s' % CONF.config_file[0])
-
-    servers = []
-    servers.append(create_server(CONF.config_file[0],
-                                 'admin',
-                                 int(options['admin_port'])))
-    servers.append(create_server(CONF.config_file[0],
-                                 'main',
-                                 int(options['public_port'])))
-    serve(*servers)
diff --git a/bin/keystone-server b/bin/keystone-server
new file mode 100755
index 00000000..d30d9c61
--- /dev/null
+++ b/bin/keystone-server
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+import greenlet
+import logging
+import os
+import sys
+
+# If ../../keystone/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+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-server',
+                               '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
+from paste import deploy
+
+from keystone import config
+from keystone.common import wsgi
+
+
+CONF = config.CONF
+
+
+def create_server(conf, name, port):
+    app = deploy.loadapp('config:%s' % conf, name=name)
+    return wsgi.Server(app, port)
+
+
+def serve(*servers):
+    for server in servers:
+        logging.debug("starting server %s on port %s", server.application,
+                                                       server.port)
+        server.start()
+
+    for server in servers:
+        try:
+            server.wait()
+        except greenlet.GreenletExit:
+            pass
+
+
+if __name__ == '__main__':
+    dev_conf = os.path.join(possible_topdir,
+                                'etc',
+                                'keystone.conf')
+    config_files = None
+    if os.path.exists(dev_conf):
+        config_files = [dev_conf]
+
+    CONF(config_files=config_files)
+
+    config.setup_logging(CONF)
+
+    # Log the options used when starting if we're in debug mode...
+    if CONF.debug:
+        CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG)
+
+    options = deploy.appconfig('config:%s' % CONF.config_file[0])
+
+    servers = []
+    servers.append(create_server(CONF.config_file[0],
+                                 'admin',
+                                 int(options['admin_port'])))
+    servers.append(create_server(CONF.config_file[0],
+                                 'main',
+                                 int(options['public_port'])))
+    serve(*servers)
diff --git a/setup.py b/setup.py
index 5f52c702..fa5c3bea 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'],
       )
-- 
cgit