From 4bf9d7a74a076ddb11f76b948aae8718d8ec7448 Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Mon, 1 Apr 2013 16:41:39 -0400
Subject: [PATCH] change the install/configure split
make setup_develop part of install so that configure is only about
config file setup.
Change-Id: I1ed58011e41c550d3ab2ba33b38cfe16adb3dde4
---
lib/cinder | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/cinder b/lib/cinder
index 7afd69bdc8..710d94219d 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -123,9 +123,6 @@ function cleanup_cinder() {
# configure_cinder() - Set config files, create data dirs, etc
function configure_cinder() {
- setup_develop $CINDER_DIR
- setup_develop $CINDERCLIENT_DIR
-
if [[ ! -d $CINDER_CONF_DIR ]]; then
sudo mkdir -p $CINDER_CONF_DIR
fi
@@ -367,7 +364,10 @@ function init_cinder() {
# install_cinder() - Collect source and prepare
function install_cinder() {
git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH
+ setup_develop $CINDER_DIR
+
git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH
+ setup_develop $CINDERCLIENT_DIR
}
# apply config.d approach (e.g. Oneiric does not have this)