openstack/devstack
Code Issues Proposed changes

change configure/install split

Browse Source 
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
This commit is contained in:
Sean Dague 2013-04-01 16:44:31 -04:00
parent 4bf9d7a74a
commit 1b4b4be78c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/keystone
View File

@ -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 # configure_keystone() - Set config files, create data dirs, etc
function configure_keystone() { function configure_keystone() {
setup_develop $KEYSTONE_DIR
if [[ ! -d $KEYSTONE_CONF_DIR ]]; then if [[ ! -d $KEYSTONE_CONF_DIR ]]; then
sudo mkdir -p $KEYSTONE_CONF_DIR sudo mkdir -p $KEYSTONE_CONF_DIR
fi fi
@ -305,6 +298,7 @@ function init_keystone() {
# install_keystoneclient() - Collect source and prepare # install_keystoneclient() - Collect source and prepare
function install_keystoneclient() { function install_keystoneclient() {
git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH
setup_develop $KEYSTONECLIENT_DIR
} }
# install_keystone() - Collect source and prepare # install_keystone() - Collect source and prepare
@ -314,6 +308,7 @@ function install_keystone() {
install_ldap install_ldap
fi fi
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
setup_develop $KEYSTONE_DIR
} }
# start_keystone() - Start running processes, including screen # start_keystone() - Start running processes, including screen

1
stack.sh
View File

@ -627,7 +627,6 @@ fi
echo_summary "Configuring OpenStack projects" echo_summary "Configuring OpenStack projects"
# Set up our checkouts so they are installed in the python path # Set up our checkouts so they are installed in the python path
configure_keystoneclient
configure_novaclient configure_novaclient
setup_develop $OPENSTACKCLIENT_DIR setup_develop $OPENSTACKCLIENT_DIR