modified keystone-control and reshuffling of file names

4 files changed, 16 insertions, 31 deletions

diff --git a/bin/scripts/keystone-control b/bin/keystone-auth
index 5982a137..c1e75daf 100644..100755
--- a/bin/scripts/keystone-control
+++ b/bin/keystone-auth
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
@@ -19,7 +19,7 @@
 #    under the License.
 
 """
-Glance API Server
+Keystone API Server
 """
 
 import optparse
@@ -30,7 +30,6 @@ import sys
 # 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,
                                    os.pardir))
 if os.path.exists(os.path.join(possible_topdir, 'keystone', '__init__.py')):
     sys.path.insert(0, possible_topdir)
diff --git a/keystone/auth_server.py b/keystone/auth_server.py
index f88b715b..d8a50bf6 100755
--- a/keystone/auth_server.py
+++ b/keystone/auth_server.py
@@ -51,7 +51,7 @@ from webob.exc import (HTTPNotFound,
                        HTTPBadRequest)
 
 POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-                                   os.pardir,os.pardir,
+                                   os.pardir,
                                    os.pardir))
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'keystone', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
diff --git a/keystone/version.py b/keystone/version.py
index 15473f5b..332f5841 100755
--- a/keystone/version.py
+++ b/keystone/version.py
@@ -13,22 +13,14 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
-try:
-    from glance.vcsversion import version_info
-except ImportError:
-    version_info = {'branch_nick': u'LOCALBRANCH',
-                    'revision_id': 'LOCALREVISION',
-                    'revno': 0}
-
-GLANCE_VERSION = ['2011', '2']
-YEAR, COUNT = GLANCE_VERSION
+KEYSTONE_VERSION = ['1', '0']
+MAJOR, MINOR = KEYSTONE_VERSION
 
 FINAL = True   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():
-    return '.'.join([YEAR, COUNT])
+    return '.'.join([MAJOR, MINOR])
 
 
 def version_string():
@@ -37,10 +29,3 @@ def version_string():
     else:
         return '%s-dev' % (canonical_version_string(),)
 
-
-def vcs_version_string():
-    return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
-
-
-def version_string_with_vcs():
-    return "%s-%s" % (canonical_version_string(), vcs_version_string())
diff --git a/setup.py b/setup.py
index 83ead0ca..41f326cd 100644
--- a/setup.py
+++ b/setup.py
@@ -30,13 +30,14 @@ setup(
     url='http://www.openstack.org',
     include_package_data=True,
     packages=find_packages(exclude=['test', 'bin']),
-    zip_safe=False,
-    install_requires=['setuptools'],
-    entry_points={
-        'paste.app_factory': ['main=identity:app_factory'],
-        'paste.filter_factory': [
-            'papiauth=keystone:papiauth_factory',
-            'tokenauth=keystone:tokenauth_factory',
-            ],
-        },
+    scripts=['bin/keystone']
+#    zip_safe=False,
+#    install_requires=['setuptools'],
+#    entry_points={
+#        'paste.app_factory': ['main=identity:app_factory'],
+#        'paste.filter_factory': [
+#            'papiauth=keystone:papiauth_factory',
+#            'tokenauth=keystone:tokenauth_factory',
+#            ],
+#        },
     )