From 253a1a351b13fd434c9246e7994fb669b1691d20 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 1 Apr 2013 18:23:22 -0500
Subject: [PATCH] Move setup_develop call

Move setup_develop() call into the install_XXX() function as the
distinction has no real purpose.  This eliminates the configure_XXXclient()
function for Nova and Swift.

Also create install_cinderclient() as we will need it to handle dependencies
in a followup patch.

Chasing down another #$^%&&^^^$%%#$ prettytable version pin

Change-Id: I61d761bc57a31caf2ed0ade326ab236eb2bb7358
---
 lib/cinder |  3 +++
 lib/nova   |  9 ++-------
 lib/swift  | 10 ++--------
 stack.sh   |  5 ++---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/lib/cinder b/lib/cinder
index 710d94219d..deace68277 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -365,7 +365,10 @@ function init_cinder() {
 function install_cinder() {
     git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH
     setup_develop $CINDER_DIR
+}
 
+# install_cinderclient() - Collect source and prepare
+function install_cinderclient() {
     git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH
     setup_develop $CINDERCLIENT_DIR
 }
diff --git a/lib/nova b/lib/nova
index 91fe0280c0..8d045b5aa9 100644
--- a/lib/nova
+++ b/lib/nova
@@ -169,11 +169,6 @@ function cleanup_nova() {
     sudo rm -rf $NOVA_STATE_PATH $NOVA_AUTH_CACHE_DIR
 }
 
-# configure_novaclient() - Set config files, create data dirs, etc
-function configure_novaclient() {
-    setup_develop $NOVACLIENT_DIR
-}
-
 # configure_nova_rootwrap() - configure Nova's rootwrap
 function configure_nova_rootwrap() {
     # Deploy new rootwrap filters files (owned by root).
@@ -204,8 +199,6 @@ function configure_nova_rootwrap() {
 
 # configure_nova() - Set config files, create data dirs, etc
 function configure_nova() {
-    setup_develop $NOVA_DIR
-
     # Put config files in ``/etc/nova`` for everyone to find
     if [[ ! -d $NOVA_CONF_DIR ]]; then
         sudo mkdir -p $NOVA_CONF_DIR
@@ -597,6 +590,7 @@ function init_nova() {
 # install_novaclient() - Collect source and prepare
 function install_novaclient() {
     git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
+    setup_develop $NOVACLIENT_DIR
 }
 
 # install_nova() - Collect source and prepare
@@ -627,6 +621,7 @@ function install_nova() {
     fi
 
     git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
+    setup_develop $NOVA_DIR
 }
 
 # start_nova_api() - Start the API process ahead of other things
diff --git a/lib/swift b/lib/swift
index 3e7ee20b1d..eb57477ed7 100644
--- a/lib/swift
+++ b/lib/swift
@@ -106,8 +106,6 @@ function configure_swift() {
     local swift_node_config
     local swift_log_dir
 
-    setup_develop $SWIFT_DIR
-
     # Make sure to kill all swift processes first
     swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
 
@@ -281,11 +279,6 @@ EOF
         tee /etc/rsyslog.d/10-swift.conf
 }
 
-# configure_swiftclient() - Set config files, create data dirs, etc
-function configure_swiftclient() {
-    setup_develop $SWIFTCLIENT_DIR
-}
-
 # create_swift_disk - Create Swift backing disk
 function create_swift_disk() {
     local node_number
@@ -374,13 +367,14 @@ function init_swift() {
 
 function install_swift() {
     git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
+    setup_develop $SWIFT_DIR
 }
 
 function install_swiftclient() {
     git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH
+    setup_develop $SWIFTCLIENT_DIR
 }
 
-
 # start_swift() - Start running processes, including screen
 function start_swift() {
     # (re)start rsyslog
diff --git a/stack.sh b/stack.sh
index e6654501b6..1010b4e031 100755
--- a/stack.sh
+++ b/stack.sh
@@ -564,9 +564,11 @@ echo_summary "Installing OpenStack project source"
 # Grab clients first
 install_keystoneclient
 install_glanceclient
+install_cinderclient
 install_novaclient
 # Check out the client libs that are used most
 git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
+setup_develop $OPENSTACKCLIENT_DIR
 
 # glance, swift middleware and nova api needs keystone middleware
 if is_service_enabled key g-api n-api s-proxy; then
@@ -627,8 +629,6 @@ fi
 echo_summary "Configuring OpenStack projects"
 
 # Set up our checkouts so they are installed in the python path
-configure_novaclient
-setup_develop $OPENSTACKCLIENT_DIR
 
 if is_service_enabled key g-api n-api s-proxy; then
     configure_keystone
@@ -636,7 +636,6 @@ fi
 
 if is_service_enabled s-proxy; then
     configure_swift
-    configure_swiftclient
     if is_service_enabled swift3; then
         setup_develop $SWIFT3_DIR
     fi