@@ -28,9 +28,9 @@ set +o xtrace

 # Set up default directories

 GITDIR["python-glanceclient"]=$DEST/python-glanceclient

+GIRDIR["glance_store"]=$DEST/glance_store

 GLANCE_DIR=$DEST/glance

-GLANCE_STORE_DIR=$DEST/glance_store

 GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}

 GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}

 GLANCE_AUTH_CACHE_DIR=${GLANCE_AUTH_CACHE_DIR:-/var/cache/glance}

@@ -297,8 +297,10 @@ function install_glanceclient {

 function install_glance {

     # Install glance_store from git so we make sure we're testing

     # the latest code.

-    git_clone $GLANCE_STORE_REPO $GLANCE_STORE_DIR $GLANCE_STORE_BRANCH

-    setup_develop $GLANCE_STORE_DIR

+    if use_library_from_git "glance_store"; then

+        git_clone_by_name "glance_store"

+        setup_dev_lib "glance_store"

+    fi

     git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH

     setup_develop $GLANCE_DIR

@@ -22,15 +22,10 @@ set +o xtrace

 # --------

 # Set up default repos

-SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}

-SAHARA_BRANCH=${SAHARA_BRANCH:-master}

-

-SAHARA_PYTHONCLIENT_REPO=${SAHARA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}

-SAHARA_PYTHONCLIENT_BRANCH=${SAHARA_PYTHONCLIENT_BRANCH:-master}

 # Set up default directories

+GITDIR["python-saharaclient"]=$DEST/python-saharaclient

 SAHARA_DIR=$DEST/sahara

-SAHARA_PYTHONCLIENT_DIR=$DEST/python-saharaclient

 SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}

 SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf

@@ -158,8 +153,10 @@ function install_sahara {

 # install_python_saharaclient() - Collect source and prepare

 function install_python_saharaclient {

-    git_clone $SAHARA_PYTHONCLIENT_REPO $SAHARA_PYTHONCLIENT_DIR $SAHARA_PYTHONCLIENT_BRANCH

-    setup_develop $SAHARA_PYTHONCLIENT_DIR

+    if use_library_from_git "python-saharaclient"; then

+        git_clone_by_name "python-saharaclient"

+        setup_dev_lib "python-saharaclient"

+    fi

 }

 # start_sahara() - Start running processes, including screen

@@ -144,7 +144,7 @@ GIT_BASE=${GIT_BASE:-git://git.openstack.org}

 CEILOMETER_REPO=${CEILOMETER_REPO:-${GIT_BASE}/openstack/ceilometer.git}

 CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-master}

-# volume service

+# block storage service

 CINDER_REPO=${CINDER_REPO:-${GIT_BASE}/openstack/cinder.git}

 CINDER_BRANCH=${CINDER_BRANCH:-master}

@@ -176,7 +176,11 @@ NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}

 NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}

 NOVA_BRANCH=${NOVA_BRANCH:-master}

-# storage service

+# data processing service

+SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}

+SAHARA_BRANCH=${SAHARA_BRANCH:-master}

+

+# object storage service

 SWIFT_REPO=${SWIFT_REPO:-${GIT_BASE}/openstack/swift.git}

 SWIFT_BRANCH=${SWIFT_BRANCH:-master}

@@ -241,6 +245,10 @@ GITBRANCH["python-neutronclient"]=${NEUTRONCLIENT_BRANCH:-master}

 GITREPO["python-novaclient"]=${NOVACLIENT_REPO:-${GIT_BASE}/openstack/python-novaclient.git}

 GITBRANCH["python-novaclient"]=${NOVACLIENT_BRANCH:-master}

+# python saharaclient

+GITREPO["python-saharaclient"]=${SAHARACLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}

+GITBRANCH["python-saharaclient"]=${SAHARACLIENT_BRANCH:-master}

+

 # python swift client library

 GITREPO["python-swiftclient"]=${SWIFTCLIENT_REPO:-${GIT_BASE}/openstack/python-swiftclient.git}

 GITBRANCH["python-swiftclient"]=${SWIFTCLIENT_BRANCH:-master}

@@ -330,8 +338,8 @@ GITBRANCH["pbr"]=${PBR_BRANCH:-master}

 ##################

 # glance store library

-GLANCE_STORE_REPO=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}

-GLANCE_STORE_BRANCH=${GLANCE_STORE_BRANCH:-master}

+GITREPO["glance_store"]=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}

+GITBRANCH["glance_store"]=${GLANCE_STORE_BRANCH:-master}

 # heat-cfntools server agent

 HEAT_CFNTOOLS_REPO=${HEAT_CFNTOOLS_REPO:-${GIT_BASE}/openstack/heat-cfntools.git}