@@ -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

 }

@@ -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

@@ -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

@@ -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