Some more cleaning up of git merges

4 files changed, 33 insertions, 7 deletions

diff --git a/bin/keystoned b/bin/keystoned
new file mode 100755
index 00000000..f336ca1d
--- /dev/null
+++ b/bin/keystoned
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright (C) 2011 OpenStack LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# If ../keystone/__init__.py exists, add ../ to the Python search path so
+# that it will override whatever may be installed in the default Python
+# search path.
+script_dir=`dirname $0`
+if [ -f "$script_dir/../keystone/__init__.py" ]
+then
+    PYTHONPATH="$script_dir/..:$PYTHONPATH"
+    export PYTHONPATH
+fi
+
+/usr/bin/env python -m keystone.server $*
diff --git a/keystone/auth_protocols/auth_basic.py b/keystone/auth_protocols/auth_basic.py
index 046ca08e..17f2261a 100644
--- a/keystone/auth_protocols/auth_basic.py
+++ b/keystone/auth_protocols/auth_basic.py
@@ -142,7 +142,7 @@ class AuthProtocol(object):
                                 ssl=(self.service_protocol == 'https'))
             resp = conn.getresponse()
             data = resp.read()
-            #TODO: use a more sophisticated proxy
+            #TODO(ziad): use a more sophisticated proxy
             # we are rewriting the headers now
             return Response(status=resp.status, body=data)(env, start_response)
 
diff --git a/keystone/auth_protocols/auth_openid.py b/keystone/auth_protocols/auth_openid.py
index ac9121f7..d68741df 100644
--- a/keystone/auth_protocols/auth_openid.py
+++ b/keystone/auth_protocols/auth_openid.py
@@ -85,7 +85,7 @@ class AuthProtocol(object):
              ssl=(self.service_protocol == 'https'))
         resp = conn.getresponse()
         data = resp.read()
-        #TODO: use a more sophisticated proxy
+        #TODO(ziad): use a more sophisticated proxy
         # we are rewriting the headers now
         return Response(status=resp.status, body=data)(env, start_response)
 
diff --git a/keystone/auth_protocols/auth_token.py b/keystone/auth_protocols/auth_token.py
index fbc6c622..4c5c5e9c 100644
--- a/keystone/auth_protocols/auth_token.py
+++ b/keystone/auth_protocols/auth_token.py
@@ -113,7 +113,7 @@ class AuthProtocol(object):
     def __init__(self, app, conf):
         """ Common initialization code """
 
-        #TODO: maybe we rafactor this into a superclass
+        #TODO(ziad): maybe we rafactor this into a superclass
         self._init_protocol_common(app, conf)  # Applies to all protocols
         self._init_protocol(app, conf)  # Specific to this protocol
 
@@ -209,7 +209,7 @@ class AuthProtocol(object):
 
         # Step 1: We need to auth with the keystone service, so get an
         # admin token
-        #TODO: Need to properly implement this, where to store creds
+        #TODO(ziad): Need to properly implement this, where to store creds
         # for now using token from ini
         #auth = self.get_admin_auth_token("admin", "secrete", "1")
         #admin_token = json.loads(auth)["auth"]["token"]["id"]
@@ -220,7 +220,7 @@ class AuthProtocol(object):
         headers = {"Content-type": "application/json",
                     "Accept": "text/json",
                     "X-Auth-Token": self.admin_token}
-                    ##TODO:we need to figure out how to auth to keystone
+                    ##TODO(ziad):we need to figure out how to auth to keystone
                     #since validate_token is a priviledged call
                     #Khaled's version uses creds to get a token
                     # "X-Auth-Token": admin_token}
@@ -246,7 +246,7 @@ class AuthProtocol(object):
         headers = {"Content-type": "application/json",
                     "Accept": "text/json",
                     "X-Auth-Token": self.admin_token}
-                    ##TODO:we need to figure out how to auth to keystone
+                    ##TODO(ziad):we need to figure out how to auth to keystone
                     #since validate_token is a priviledged call
                     #Khaled's version uses creds to get a token
                     # "X-Auth-Token": admin_token}
@@ -294,7 +294,7 @@ class AuthProtocol(object):
                                 ssl=(self.service_protocol == 'https'))
             resp = conn.getresponse()
             data = resp.read()
-            #TODO: use a more sophisticated proxy
+            #TODO(ziad): use a more sophisticated proxy
             # we are rewriting the headers now
             return Response(status=resp.status, body=data)(self.proxy_headers,
                                                            self.start_response)