openstack/devstack
Code Issues Proposed changes

change the install/configure split

Browse Source 
make setup_develop part of install so that configure is only about
config file setup.

Change-Id: I1ed58011e41c550d3ab2ba33b38cfe16adb3dde4
This commit is contained in:
Sean Dague 2013-04-01 16:41:39 -04:00
parent e4f0cd7eed
commit 4bf9d7a74a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cinder
View File

@ -123,9 +123,6 @@ function cleanup_cinder() {
# configure_cinder() - Set config files, create data dirs, etc # configure_cinder() - Set config files, create data dirs, etc
function configure_cinder() { function configure_cinder() {
setup_develop $CINDER_DIR
setup_develop $CINDERCLIENT_DIR
if [[ ! -d $CINDER_CONF_DIR ]]; then if [[ ! -d $CINDER_CONF_DIR ]]; then
sudo mkdir -p $CINDER_CONF_DIR sudo mkdir -p $CINDER_CONF_DIR
fi fi
@ -367,7 +364,10 @@ function init_cinder() {
# install_cinder() - Collect source and prepare # install_cinder() - Collect source and prepare
function install_cinder() { function install_cinder() {
git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH
setup_develop $CINDER_DIR
git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH
setup_develop $CINDERCLIENT_DIR
} }
# apply config.d approach (e.g. Oneiric does not have this) # apply config.d approach (e.g. Oneiric does not have this)