From b6230e76ff7a6309ec23dd1df8ffd6130699ea8e Mon Sep 17 00:00:00 2001
From: Ramana Juvvadi <rjuvvadi@hcl.com>
Date: Fri, 6 May 2011 15:50:47 -0500
Subject: Some more cleaning up of git merges

---
 bin/keystoned | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100755 bin/keystoned

(limited to 'bin')

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 $*
-- 
cgit