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
diff --git a/lib/keystone b/lib/keystone
index 875d537..0fbc7d7 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -75,15 +75,8 @@
:
}
-# 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 @@
# 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 @@
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 e2ef8f1..e665450 100755
--- a/stack.sh
+++ b/stack.sh
@@ -627,7 +627,6 @@
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