From d281376de8059d0f29bb2df725c0924800ab06db Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 6 Feb 2012 21:21:52 +0000
Subject: [PATCH] fix logging and move keystone client earlier in the install
 chain

---
 files/keystone.conf | 4 ++--
 stack.sh            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/keystone.conf b/files/keystone.conf
index ca8e31eada..0ee08279d5 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -5,8 +5,8 @@ admin_token = %SERVICE_TOKEN%
 compute_port = 3000
 verbose = True
 debug = True
-# should use stdout for devstack, but leaving this for now
-log_file = %DEST%/keystone/keystone.log
+# commented out so devstack logs to stdout
+# log_file = %DEST%/keystone/keystone.log
 
 # ================= Syslog Options ============================
 # Send logs to syslog (/dev/log) instead of to file specified
diff --git a/stack.sh b/stack.sh
index 2bac11cdb9..cedf597f06 100755
--- a/stack.sh
+++ b/stack.sh
@@ -653,6 +653,8 @@ fi
 
 # setup our checkouts so they are installed into python path
 # allowing ``import nova`` or ``import glance.client``
+cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
+cd $NOVACLIENT_DIR; sudo python setup.py develop
 if [[ "$ENABLED_SERVICES" =~ "key" ||
       "$ENABLED_SERVICES" =~ "g-api" ||
       "$ENABLED_SERVICES" =~ "n-api" ||
@@ -667,10 +669,8 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ||
       "$ENABLED_SERVICES" =~ "n-api" ]]; then
     cd $GLANCE_DIR; sudo python setup.py develop
 fi
-cd $NOVACLIENT_DIR; sudo python setup.py develop
 cd $NOVA_DIR; sudo python setup.py develop
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
-    cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
     cd $HORIZON_DIR/horizon; sudo python setup.py develop
     cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
 fi