@@ -51,9 +51,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

@@ -188,10 +185,16 @@ function init_cinder() {

     fi

 }

+# install_cinderclient() - Collect source and prepare

+function install_cinderclient() {

+    git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH

+    setup_develop $CINDERCLIENT_DIR

+}

+

 # install_cinder() - Collect source and prepare

 function install_cinder() {

     git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH

-    git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH

+    setup_develop $CINDER_DIR

 }

 # apply config.d approach (e.g. Oneiric does not have this)

@@ -63,11 +63,6 @@ function cleanup_glance() {

     :

 }

-# configure_glanceclient() - Set config files, create data dirs, etc

-function configure_glanceclient() {

-    setup_develop $GLANCECLIENT_DIR

-}

-

 # configure_glance() - Set config files, create data dirs, etc

 function configure_glance() {

     setup_develop $GLANCE_DIR

@@ -158,6 +153,7 @@ function init_glance() {

 # install_glanceclient() - Collect source and prepare

 function install_glanceclient() {

     git_clone $GLANCECLIENT_REPO $GLANCECLIENT_DIR $GLANCECLIENT_BRANCH

+    setup_develop $GLANCECLIENT_DIR

 }

 # install_glance() - Collect source and prepare

@@ -61,11 +61,6 @@ 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

 function configure_keystone() {

     setup_develop $KEYSTONE_DIR

@@ -152,6 +147,7 @@ function init_keystone() {

 # install_keystoneclient() - Collect source and prepare

 function install_keystoneclient() {

     git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH

+    setup_develop $KEYSTONECLIENT_DIR

 }

 # install_keystone() - Collect source and prepare

@@ -103,11 +103,6 @@ function cleanup_nova() {

     fi

 }

-# 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).

@@ -377,6 +372,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

@@ -824,12 +824,24 @@ pip_install $(get_packages $FILES/pips | sort -u)

 echo_summary "Installing OpenStack project source"

+# Install clients libraries

 install_keystoneclient

 install_glanceclient

+install_cinderclient

 install_novaclient

+if is_service_enabled swift glance; then

+    # storage service client and and Library

+    git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH

+    setup_develop $SWIFTCLIENT_DIR

+fi

+if is_service_enabled quantum nova; then

+    git_clone $QUANTUM_CLIENT_REPO $QUANTUM_CLIENT_DIR $QUANTUM_CLIENT_BRANCH

+    setup_develop $QUANTUM_CLIENT_DIR

+fi

 # 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 swift; then

@@ -839,8 +851,6 @@ fi

 if is_service_enabled swift; then

     # storage service

     git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH

-    # storage service client and and Library

-    git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH

     if is_service_enabled swift3; then

         # swift3 middleware to provide S3 emulation to Swift

         git_clone $SWIFT3_REPO $SWIFT3_DIR $SWIFT3_BRANCH

@@ -863,9 +873,6 @@ if is_service_enabled horizon; then

     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG

 fi

 if is_service_enabled quantum; then

-    git_clone $QUANTUM_CLIENT_REPO $QUANTUM_CLIENT_DIR $QUANTUM_CLIENT_BRANCH

-fi

-if is_service_enabled quantum; then

     # quantum

     git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH

 fi

@@ -887,26 +894,22 @@ echo_summary "Configuring OpenStack projects"

 # Set up our checkouts so they are installed into python path

 # allowing ``import nova`` or ``import glance.client``

-configure_keystoneclient

-configure_novaclient

-setup_develop $OPENSTACKCLIENT_DIR

 if is_service_enabled key g-api n-api swift; then

     configure_keystone

 fi

 if is_service_enabled swift; then

     setup_develop $SWIFT_DIR

-    setup_develop $SWIFTCLIENT_DIR

 fi

 if is_service_enabled swift3; then

     setup_develop $SWIFT3_DIR

 fi

 if is_service_enabled g-api n-api; then

     configure_glance

-fi

-# Do this _after_ glance is installed to override the old binary

-# TODO(dtroyer): figure out when this is no longer necessary

-configure_glanceclient

+    # Do this again _after_ glance is installed to overwrite

+    # the old binary shipped in glance

+    setup_develop $GLANCECLIENT_DIR

+fi

 if is_service_enabled nova; then

     configure_nova

@@ -915,7 +918,6 @@ if is_service_enabled horizon; then

     setup_develop $HORIZON_DIR

 fi

 if is_service_enabled quantum; then

-    setup_develop $QUANTUM_CLIENT_DIR

     setup_develop $QUANTUM_DIR

 fi

 if is_service_enabled heat; then