From 1b4b4be78c5f1254bebfb58624d1ef8c2a09531f Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Mon, 1 Apr 2013 16:44:31 -0400
Subject: [PATCH] change configure/install split

make it so setup_develop happens in install instead of configure
to ensure that we can handle config file generation by itself.

Change-Id: I4801d7a0bc6642de2db5b78df1750666895f0aa3
---
 lib/keystone | 9 ++-------
 stack.sh     | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/keystone b/lib/keystone
index 875d537d8b..0fbc7d709a 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -75,15 +75,8 @@ function cleanup_keystone() {
     :
 }
 
-# configure_keystoneclient() - Set config files, create data dirs, etc
-function configure_keystoneclient() {
-    setup_develop $KEYSTONECLIENT_DIR
-}
-
 # configure_keystone() - Set config files, create data dirs, etc
 function configure_keystone() {
-    setup_develop $KEYSTONE_DIR
-
     if [[ ! -d $KEYSTONE_CONF_DIR ]]; then
         sudo mkdir -p $KEYSTONE_CONF_DIR
     fi
@@ -305,6 +298,7 @@ function init_keystone() {
 # install_keystoneclient() - Collect source and prepare
 function install_keystoneclient() {
     git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH
+    setup_develop $KEYSTONECLIENT_DIR
 }
 
 # install_keystone() - Collect source and prepare
@@ -314,6 +308,7 @@ function install_keystone() {
         install_ldap
     fi
     git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
+    setup_develop $KEYSTONE_DIR
 }
 
 # start_keystone() - Start running processes, including screen
diff --git a/stack.sh b/stack.sh
index e2ef8f1955..e6654501b6 100755
--- a/stack.sh
+++ b/stack.sh
@@ -627,7 +627,6 @@ fi
 echo_summary "Configuring OpenStack projects"
 
 # Set up our checkouts so they are installed in the python path
-configure_keystoneclient
 configure_novaclient
 setup_develop $OPENSTACKCLIENT_DIR