@@ -11,7 +11,6 @@ if is_service_enabled trove; then

         cleanup_trove

     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then

         echo_summary "Configuring Trove"

-        configure_troveclient

         configure_trove

         if is_service_enabled key; then

@@ -36,6 +36,11 @@

 XTRACE=$(set +o | grep xtrace)

 set +o xtrace

+# Global Config Variables

+declare -A GITREPO

+declare -A GITBRANCH

+declare -A GITDIR

+

 # Config Functions

 # ================

@@ -577,6 +582,18 @@ function git_clone {

     cd $orig_dir

 }

+# A variation on git clone that lets us specify a project by it's

+# actual name, like oslo.config. This is exceptionally useful in the

+# library installation case

+function git_clone_by_name {

+    local name=$1

+    local repo=${GITREPO[$name]}

+    local dir=${GITDIR[$name]}

+    local branch=${GITBRANCH[$name]}

+    git_clone $repo $dir $branch

+}

+

+

 # git can sometimes get itself infinitely stuck with transient network

 # errors or other issues with the remote end.  This wraps git in a

 # timeout/retry loop and is intended to watch over non-local git

@@ -1369,6 +1386,37 @@ function pip_install {

         && $SUDO_PIP rm -rf ${pip_build_tmp}

 }

+# should we use this library from their git repo, or should we let it

+# get pulled in via pip dependencies.

+function use_library_from_git {

+    local name=$1

+    local enabled=1

+    [[ ,${LIBS_FROM_GIT}, =~ ,${name}, ]] && enabled=0

+    return $enabled

+}

+

+# setup a library by name. If we are trying to use the library from

+# git, we'll do a git based install, otherwise we'll punt and the

+# library should be installed by a requirements pull from another

+# project.

+function setup_lib {

+    local name=$1

+    local dir=${GITDIR[$name]}

+    setup_install $dir

+}

+

+# setup a library by name in editiable mode. If we are trying to use

+# the library from git, we'll do a git based install, otherwise we'll

+# punt and the library should be installed by a requirements pull from

+# another project.

+#

+# use this for non namespaced libraries

+function setup_dev_lib {

+    local name=$1

+    local dir=${GITDIR[$name]}

+    setup_develop $dir

+}

+

 # this should be used if you want to install globally, all libraries should

 # use this, especially *oslo* ones

 function setup_install {

@@ -35,8 +35,9 @@ set +o xtrace

 # --------

 # Set up default directories

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

+

 CEILOMETER_DIR=$DEST/ceilometer

-CEILOMETERCLIENT_DIR=$DEST/python-ceilometerclient

 CEILOMETER_CONF_DIR=/etc/ceilometer

 CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf

 CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api

@@ -123,12 +124,6 @@ function cleanup_ceilometer {

     fi

 }

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

-function configure_ceilometerclient {

-    setup_develop $CEILOMETERCLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$CEILOMETERCLIENT_DIR/tools/,/etc/bash_completion.d/}ceilometer.bash_completion

-}

-

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

 function configure_ceilometer {

     setup_develop $CEILOMETER_DIR

@@ -230,7 +225,11 @@ function install_ceilometer {

 # install_ceilometerclient() - Collect source and prepare

 function install_ceilometerclient {

-    git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH

+    if use_library_from_git "python-ceilometerclient"; then

+        git_clone_by_name "python-ceilometerclient"

+        setup_dev_lib "python-ceilometerclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-ceilometerclient"]}/tools/,/etc/bash_completion.d/}ceilometer.bash_completion

+    fi

 }

 # start_ceilometer() - Start running processes, including screen

@@ -35,8 +35,9 @@ if [[ -r $CINDER_PLUGINS/$CINDER_DRIVER ]]; then

 fi

 # set up default directories

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

+

 CINDER_DIR=$DEST/cinder

-CINDERCLIENT_DIR=$DEST/python-cinderclient

 CINDER_STATE_PATH=${CINDER_STATE_PATH:=$DATA_DIR/cinder}

 CINDER_AUTH_CACHE_DIR=${CINDER_AUTH_CACHE_DIR:-/var/cache/cinder}

@@ -475,9 +476,11 @@ function install_cinder {

 # install_cinderclient() - Collect source and prepare

 function install_cinderclient {

-    git_clone $CINDERCLIENT_REPO $CINDERCLIENT_DIR $CINDERCLIENT_BRANCH

-    setup_develop $CINDERCLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$CINDERCLIENT_DIR/tools/,/etc/bash_completion.d/}cinder.bash_completion

+    if use_library_from_git "python-cinderclient"; then

+        git_clone_by_name "python-cinderclient"

+        setup_dev_lib "python-cinderclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-cinderclient"]}/tools/,/etc/bash_completion.d/}cinder.bash_completion

+    fi

 }

 # apply config.d approach for cinder volumes directory

@@ -27,8 +27,9 @@ set +o xtrace

 # --------

 # Set up default directories

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

+

 GLANCE_DIR=$DEST/glance

-GLANCECLIENT_DIR=$DEST/python-glanceclient

 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}

@@ -234,8 +235,10 @@ function init_glance {

 # install_glanceclient() - Collect source and prepare

 function install_glanceclient {

-    git_clone $GLANCECLIENT_REPO $GLANCECLIENT_DIR $GLANCECLIENT_BRANCH

-    setup_develop $GLANCECLIENT_DIR

+    if use_library_from_git "python-glanceclient"; then

+        git_clone_by_name "python-glanceclient"

+        setup_dev_lib "python-glanceclient"

+    fi

 }

 # install_glance() - Collect source and prepare

@@ -29,8 +29,9 @@ set +o xtrace

 # --------

 # set up default directories

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

+

 HEAT_DIR=$DEST/heat

-HEATCLIENT_DIR=$DEST/python-heatclient

 HEAT_AUTH_CACHE_DIR=${HEAT_AUTH_CACHE_DIR:-/var/cache/heat}

 HEAT_STANDALONE=`trueorfalse False $HEAT_STANDALONE`

 HEAT_CONF_DIR=/etc/heat

@@ -165,9 +166,11 @@ function create_heat_cache_dir {

 # install_heatclient() - Collect source and prepare

 function install_heatclient {

-    git_clone $HEATCLIENT_REPO $HEATCLIENT_DIR $HEATCLIENT_BRANCH

-    setup_develop $HEATCLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$HEATCLIENT_DIR/tools/,/etc/bash_completion.d/}heat.bash_completion

+    if use_library_from_git "python-heatclient"; then

+        git_clone_by_name "python-heatclient"

+        setup_dev_lib "python-heatclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-heatclient"]}/tools/,/etc/bash_completion.d/}heat.bash_completion

+    fi

 }

 # install_heat() - Collect source and prepare

@@ -25,8 +25,9 @@ set +o xtrace

 # --------

 # Set up default directories

+GITDIR["django_openstack_auth"]=$DEST/django_openstack_auth

+

 HORIZON_DIR=$DEST/horizon

-HORIZONAUTH_DIR=$DEST/django_openstack_auth

 # local_settings.py is used to customize Dashboard settings.

 # The example file in Horizon repo is used by default.

@@ -144,8 +145,12 @@ function init_horizon {

 # install_django_openstack_auth() - Collect source and prepare

 function install_django_openstack_auth {

-    git_clone $HORIZONAUTH_REPO $HORIZONAUTH_DIR $HORIZONAUTH_BRANCH

-    setup_install $HORIZONAUTH_DIR

+    if use_library_from_git "django_openstack_auth"; then

+        local dir=${GITDIR["django_openstack_auth"]}

+        git_clone_by_name "django_openstack_auth"

+    fi

+    # if we aren't using this library from git, then we just let it

+    # get dragged in by the horizon setup.

 }

 # install_horizon() - Collect source and prepare

@@ -20,7 +20,7 @@ set +o xtrace

 # Defaults

 # --------

-PBR_DIR=$DEST/pbr

+GITDIR["pbr"]=$DEST/pbr

 REQUIREMENTS_DIR=$DEST/requirements

 # Entry Points

@@ -45,8 +45,12 @@ function install_infra {

     git_clone $REQUIREMENTS_REPO $REQUIREMENTS_DIR $REQUIREMENTS_BRANCH

     # Install pbr

-    git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH

-    setup_install $PBR_DIR

+    if use_library_from_git "pbr"; then

+        git_clone_by_name "pbr"

+        setup_lib "pbr"

+    else

+        pip_install "pbr"

+    fi

 }

 # Restore xtrace

@@ -28,10 +28,11 @@ set +o pipefail

 # --------

 # Set up default directories

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

+

 IRONIC_DIR=$DEST/ironic

 IRONIC_DATA_DIR=$DATA_DIR/ironic

 IRONIC_STATE_PATH=/var/lib/ironic

-IRONICCLIENT_DIR=$DEST/python-ironicclient

 IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}

 IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}

 IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf

@@ -108,8 +109,22 @@ function install_ironic {

 # install_ironicclient() - Collect sources and prepare

 function install_ironicclient {

-    git_clone $IRONICCLIENT_REPO $IRONICCLIENT_DIR $IRONICCLIENT_BRANCH

-    setup_develop $IRONICCLIENT_DIR

+    if use_library_from_git "python-ironicclient"; then

+        git_clone_by_name "python-ironicclient"

+        setup_dev_lib "python-ironicclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-ironicclient"]}/tools/,/etc/bash_completion.d/}ironic.bash_completion

+    else

+        # nothing actually "requires" ironicclient, so force instally from pypi

+        pip_install python-ironicclient

+    fi

+}

+

+# _cleanup_ironic_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file

+function _cleanup_ironic_apache_wsgi {

+    sudo rm -rf $IRONIC_HTTP_DIR

+    disable_apache_site ironic

+    sudo rm -f $(apache_site_config_for ironic)

+    restart_apache_server

 }

 # cleanup_ironic() - Remove residual data files, anything left over from previous

@@ -32,6 +32,9 @@ set +o xtrace

 # --------

 # Set up default directories

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

+GITDIR["keystonemiddleware"]=$DEST/keystonemiddleware

+

 KEYSTONE_DIR=$DEST/keystone

 KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}

 KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf

@@ -39,8 +42,6 @@ KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}

 KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone}

 KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}

-KEYSTONECLIENT_DIR=$DEST/python-keystoneclient

-

 # Select the backend for Keystone's service catalog

 KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}

 KEYSTONE_CATALOG=$KEYSTONE_CONF_DIR/default_catalog.templates

@@ -389,9 +390,19 @@ function init_keystone {

 # install_keystoneclient() - Collect source and prepare

 function install_keystoneclient {

-    git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH

-    setup_develop $KEYSTONECLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$KEYSTONECLIENT_DIR/tools/,/etc/bash_completion.d/}keystone.bash_completion

+    if use_library_from_git "python-keystoneclient"; then

+        git_clone_by_name "python-keystoneclient"

+        setup_dev_lib "python-keystoneclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-keystoneclient"]}/tools/,/etc/bash_completion.d/}keystone.bash_completion

+    fi

+}

+

+# install_keystonemiddleware() - Collect source and prepare

+function install_keystonemiddleware {

+    if use_library_from_git "keystonemiddleware"; then

+        git_clone_by_name "keystonemiddleware"

+        setup_dev_lib "keystonemiddleware"

+    fi

 }

 # install_keystone() - Collect source and prepare

@@ -70,8 +70,10 @@ PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}

 PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}

 # Set up default directories

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

+

+

 NEUTRON_DIR=$DEST/neutron

-NEUTRONCLIENT_DIR=$DEST/python-neutronclient

 NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}

 # Support entry points installation of console scripts

@@ -450,9 +452,11 @@ function install_neutron {

 # install_neutronclient() - Collect source and prepare

 function install_neutronclient {

-    git_clone $NEUTRONCLIENT_REPO $NEUTRONCLIENT_DIR $NEUTRONCLIENT_BRANCH

-    setup_develop $NEUTRONCLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$NEUTRONCLIENT_DIR/tools/,/etc/bash_completion.d/}neutron.bash_completion

+    if use_library_from_git "python-neutronclient"; then

+        git_clone_by_name "python-neutronclient"

+        setup_dev_lib "python-neutronclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-neutronclient"]}/tools/,/etc/bash_completion.d/}neutron.bash_completion

+    fi

 }

 # install_neutron_agent_packages() - Collect source and prepare

@@ -29,8 +29,10 @@ set +o xtrace

 # --------

 # Set up default directories

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

+

+

 NOVA_DIR=$DEST/nova

-NOVACLIENT_DIR=$DEST/python-novaclient

 NOVA_STATE_PATH=${NOVA_STATE_PATH:=$DATA_DIR/nova}

 # INSTANCES_PATH is the previous name for this

 NOVA_INSTANCES_PATH=${NOVA_INSTANCES_PATH:=${INSTANCES_PATH:=$NOVA_STATE_PATH/instances}}

@@ -650,9 +652,11 @@ function init_nova {

 # install_novaclient() - Collect source and prepare

 function install_novaclient {

-    git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH

-    setup_develop $NOVACLIENT_DIR

-    sudo install -D -m 0644 -o $STACK_USER {$NOVACLIENT_DIR/tools/,/etc/bash_completion.d/}nova.bash_completion

+    if use_library_from_git "python-novaclient"; then

+        git_clone_by_name "python-novaclient"

+        setup_dev_lib "python-novaclient"

+        sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-novaclient"]}/tools/,/etc/bash_completion.d/}nova.bash_completion

+    fi

 }

 # install_nova() - Collect source and prepare

@@ -20,59 +20,52 @@ set +o xtrace

 # Defaults

 # --------

-CLIFF_DIR=$DEST/cliff

-OSLOCFG_DIR=$DEST/oslo.config

-OSLOMSG_DIR=$DEST/oslo.messaging

-OSLORWRAP_DIR=$DEST/oslo.rootwrap

-OSLOVMWARE_DIR=$DEST/oslo.vmware

-PYCADF_DIR=$DEST/pycadf

-STEVEDORE_DIR=$DEST/stevedore

-TASKFLOW_DIR=$DEST/taskflow

+GITDIR["cliff"]=$DEST/cliff

+GITDIR["oslo.config"]=$DEST/oslo.config

+GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency

+GITDIR["oslo.db"]=$DEST/oslo.db

+GITDIR["oslo.i18n"]=$DEST/oslo.i18n

+GITDIR["oslo.log"]=$DEST/oslo.log

+GITDIR["oslo.middleware"]=$DEST/oslo.middleware

+GITDIR["oslo.messaging"]=$DEST/oslo.messaging

+GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap

+GITDIR["oslo.serialization"]=$DEST/oslo.serialization

+GITDIR["oslo.utils"]=$DEST/oslo.utils

+GITDIR["oslo.vmware"]=$DEST/oslo.vmware

+GITDIR["pycadf"]=$DEST/pycadf

+GITDIR["stevedore"]=$DEST/stevedore

+GITDIR["taskflow"]=$DEST/taskflow

 # Entry Points

 # ------------

+function _do_install_oslo_lib {

+    local name=$1

+    if use_library_from_git "$name"; then

+        git_clone_by_name "$name"

+        setup_lib "$name"

+    fi

+}

+

 # install_oslo() - Collect source and prepare

 function install_oslo {

-    # TODO(sdague): remove this once we get to Icehouse, this just makes

-    # for a smoother transition of existing users.

-    cleanup_oslo

-

-    git_clone $CLIFF_REPO $CLIFF_DIR $CLIFF_BRANCH

-    setup_install $CLIFF_DIR

-

-    git_clone $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH

-    setup_install $OSLOCFG_DIR

-

-    git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH

-    setup_install $OSLOMSG_DIR

-

-    git_clone $OSLORWRAP_REPO $OSLORWRAP_DIR $OSLORWRAP_BRANCH

-    setup_install $OSLORWRAP_DIR

-

-    git_clone $OSLOVMWARE_REPO $OSLOVMWARE_DIR $OSLOVMWARE_BRANCH

-    setup_install $OSLOVMWARE_DIR

-

-    git_clone $PYCADF_REPO $PYCADF_DIR $PYCADF_BRANCH

-    setup_install $PYCADF_DIR

-

-    git_clone $STEVEDORE_REPO $STEVEDORE_DIR $STEVEDORE_BRANCH

-    setup_install $STEVEDORE_DIR

-

-    git_clone $TASKFLOW_REPO $TASKFLOW_DIR $TASKFLOW_BRANCH

-    setup_install $TASKFLOW_DIR

+    _do_install_oslo_lib "cliff"

+    _do_install_oslo_lib "oslo.i18n"

+    _do_install_oslo_lib "oslo.utils"

+    _do_install_oslo_lib "oslo.serialization"

+    _do_install_oslo_lib "oslo.config"

+    _do_install_oslo_lib "oslo.concurrency"

+    _do_install_oslo_lib "oslo.log"

+    _do_install_oslo_lib "oslo.middleware"

+    _do_install_oslo_lib "oslo.messaging"

+    _do_install_oslo_lib "oslo.rootwrap"

+    _do_install_oslo_lib "oslo.db"

+    _do_install_oslo_lib "oslo.vmware"

+    _do_install_oslo_lib "pycadf"

+    _do_install_oslo_lib "stevedore"

+    _do_install_oslo_lib "taskflow"

 }

-# cleanup_oslo() - purge possibly old versions of oslo

-function cleanup_oslo {

-    # this means we've got an old oslo installed, lets get rid of it

-    if ! python -c 'import oslo.config' 2>/dev/null; then

-        echo "Found old oslo.config... removing to ensure consistency"

-        local PIP_CMD=$(get_pip_command)

-        pip_install oslo.config

-        sudo $PIP_CMD uninstall -y oslo.config

-    fi

-}

 # Restore xtrace

 $XTRACE

@@ -20,12 +20,10 @@ set +o xtrace

 # Defaults

 # --------

-# Set up default repos

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

-SAHARA_BRANCH=${SAHARA_BRANCH:-master}

-

 # Set up default directories

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

 SAHARA_DIR=$DEST/sahara

+

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

 SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf

@@ -157,6 +155,14 @@ function install_sahara {

     setup_develop $SAHARA_DIR

 }

+# install_python_saharaclient() - Collect source and prepare

+function install_python_saharaclient {

+    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

 function start_sahara {

     run_process sahara "$SAHARA_BIN_DIR/sahara-api --config-file $SAHARA_CONF_FILE"

@@ -30,8 +30,10 @@ set +o xtrace

 # --------

 # Set up default directories

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

+

+

 SWIFT_DIR=$DEST/swift

-SWIFTCLIENT_DIR=$DEST/python-swiftclient

 SWIFT_AUTH_CACHE_DIR=${SWIFT_AUTH_CACHE_DIR:-/var/cache/swift}

 SWIFT_APACHE_WSGI_DIR=${SWIFT_APACHE_WSGI_DIR:-/var/www/swift}

 SWIFT3_DIR=$DEST/swift3

@@ -630,8 +632,10 @@ function install_swift {

 }

 function install_swiftclient {

-    git_clone $SWIFTCLIENT_REPO $SWIFTCLIENT_DIR $SWIFTCLIENT_BRANCH

-    setup_develop $SWIFTCLIENT_DIR

+    if use_library_from_git "python-swiftclient"; then

+        git_clone_by_name "python-swiftclient"

+        setup_dev_lib "python-swiftclient"

+    fi

 }

 # start_swift() - Start running processes, including screen

@@ -45,6 +45,8 @@ set +o xtrace

 # --------

 # Set up default directories

+GITDIR["tempest-lib"]=$DEST/tempest-lib

+

 TEMPEST_DIR=$DEST/tempest

 TEMPEST_CONFIG_DIR=${TEMPEST_CONFIG_DIR:-$TEMPEST_DIR/etc}

 TEMPEST_CONFIG=$TEMPEST_CONFIG_DIR/tempest.conf

@@ -417,6 +419,14 @@ function create_tempest_accounts {

     fi

 }

+# install_tempest_lib() - Collect source, prepare, and install tempest-lib

+function install_tempest_lib {

+    if use_library_from_git "tempest-lib"; then

+        git_clone_by_name "tempest-lib"

+        setup_dev_lib "tempest-lib"

+    fi

+}

+

 # install_tempest() - Collect source and prepare

 function install_tempest {

     git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH

@@ -25,8 +25,9 @@ set +o xtrace

 NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}

 # Set up default configuration

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

+

 TROVE_DIR=$DEST/trove

-TROVECLIENT_DIR=$DEST/python-troveclient

 TROVE_CONF_DIR=/etc/trove

 TROVE_LOCAL_CONF_DIR=$TROVE_DIR/etc/trove

 TROVE_AUTH_CACHE_DIR=${TROVE_AUTH_CACHE_DIR:-/var/cache/trove}

@@ -112,10 +113,6 @@ function cleanup_trove {

     rm -fr $TROVE_CONF_DIR/*

 }

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

-function configure_troveclient {

-    setup_develop $TROVECLIENT_DIR

-}

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

 function configure_trove {

@@ -189,7 +186,10 @@ function configure_trove {

 # install_troveclient() - Collect source and prepare

 function install_troveclient {

-    git_clone $TROVECLIENT_REPO $TROVECLIENT_DIR $TROVECLIENT_BRANCH

+    if use_library_from_git "python-troveclient"; then

+        git_clone_by_name "python-troveclient"

+        setup_dev_lib "python-troveclient"

+    fi

 }

 # install_trove() - Collect source and prepare

@@ -360,9 +360,6 @@ if [[ -d $TOP_DIR/extras.d ]]; then

     done

 fi

-# Set the destination directories for other OpenStack projects

-OPENSTACKCLIENT_DIR=$DEST/python-openstackclient

-

 # Interactive Configuration

 # -------------------------

@@ -693,8 +690,13 @@ if is_service_enabled heat horizon; then

     install_heatclient

 fi

-git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH

-setup_develop $OPENSTACKCLIENT_DIR

+# install the OpenStack client, needed for most setup commands

+if use_library_from_git "python-openstackclient"; then

+    git_clone_by_name "python-openstackclient"

+    setup_dev_lib "python-openstackclient"

+else

+    pip_install python-openstackclient

+fi

 if is_service_enabled key; then

     install_keystone

@@ -750,7 +752,6 @@ if is_service_enabled ceilometer; then

     install_ceilometer

     echo_summary "Configuring Ceilometer"

     configure_ceilometer

-    configure_ceilometerclient

 fi

 if is_service_enabled heat; then

@@ -97,160 +97,246 @@ GIT_TIMEOUT=${GIT_TIMEOUT:-0}

 # Another option is http://review.openstack.org/p

 GIT_BASE=${GIT_BASE:-git://git.openstack.org}

+##############

+#

+#  OpenStack Server Components

+#

+##############

+

 # metering service

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

 CEILOMETER_BRANCH=${CEILOMETER_BRANCH:-stable/icehouse}

-# ceilometer client library

-CEILOMETERCLIENT_REPO=${CEILOMETERCLIENT_REPO:-${GIT_BASE}/openstack/python-ceilometerclient.git}

-CEILOMETERCLIENT_BRANCH=${CEILOMETERCLIENT_BRANCH:-master}

-

-# volume service

+# block storage service

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

 CINDER_BRANCH=${CINDER_BRANCH:-stable/icehouse}

-# volume client

-CINDERCLIENT_REPO=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}

-CINDERCLIENT_BRANCH=${CINDERCLIENT_BRANCH:-master}

-

 # image catalog service

 GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}

 GLANCE_BRANCH=${GLANCE_BRANCH:-stable/icehouse}

-# python glance client library

-GLANCECLIENT_REPO=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}

-GLANCECLIENT_BRANCH=${GLANCECLIENT_BRANCH:-master}

-

 # heat service

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

 HEAT_BRANCH=${HEAT_BRANCH:-stable/icehouse}

-# python heat client library

-HEATCLIENT_REPO=${HEATCLIENT_REPO:-${GIT_BASE}/openstack/python-heatclient.git}

-HEATCLIENT_BRANCH=${HEATCLIENT_BRANCH:-master}

-

 # django powered web control panel for openstack

 HORIZON_REPO=${HORIZON_REPO:-${GIT_BASE}/openstack/horizon.git}

 HORIZON_BRANCH=${HORIZON_BRANCH:-stable/icehouse}

-# django openstack_auth library

-HORIZONAUTH_REPO=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}

-HORIZONAUTH_BRANCH=${HORIZONAUTH_BRANCH:-master}

-

 # baremetal provisionint service

 IRONIC_REPO=${IRONIC_REPO:-${GIT_BASE}/openstack/ironic.git}

 IRONIC_BRANCH=${IRONIC_BRANCH:-stable/icehouse}

-# ironic client

-IRONICCLIENT_REPO=${IRONICCLIENT_REPO:-${GIT_BASE}/openstack/python-ironicclient.git}

-IRONICCLIENT_BRANCH=${IRONICCLIENT_BRANCH:-master}

-

 # unified auth system (manages accounts/tokens)

 KEYSTONE_REPO=${KEYSTONE_REPO:-${GIT_BASE}/openstack/keystone.git}

 KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-stable/icehouse}

-# python keystone client library to nova that horizon uses

-KEYSTONECLIENT_REPO=${KEYSTONECLIENT_REPO:-${GIT_BASE}/openstack/python-keystoneclient.git}

-KEYSTONECLIENT_BRANCH=${KEYSTONECLIENT_BRANCH:-master}

+# neutron service

+NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}

+NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/icehouse}

 # compute service

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

 NOVA_BRANCH=${NOVA_BRANCH:-stable/icehouse}

+# 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:-stable/icehouse}

+

+# trove service

+TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}

+TROVE_BRANCH=${TROVE_BRANCH:-stable/icehouse}

+

+##############

+#

+#  Testing Components

+#

+##############

+

+# consolidated openstack requirements

+REQUIREMENTS_REPO=${REQUIREMENTS_REPO:-${GIT_BASE}/openstack/requirements.git}

+REQUIREMENTS_BRANCH=${REQUIREMENTS_BRANCH:-stable/icehouse}

+

+# Tempest test suite

+TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}

+TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}

+

+# TODO(sdague): this should end up as a library component like below

+GITREPO["tempest-lib"]=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}

+GITBRANCH["tempest-lib"]=${TEMPEST_LIB_BRANCH:-master}

+

+

+##############

+#

+#  OpenStack Client Library Componets

+#

+##############

+

+# ceilometer client library

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

+GITBRANCH["python-ceilometerclient"]=${CEILOMETERCLIENT_BRANCH:-master}

+

+# volume client

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

+GITBRANCH["python-cinderclient"]=${CINDERCLIENT_BRANCH:-master}

+

+# python glance client library

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

+GITBRANCH["python-glanceclient"]=${GLANCECLIENT_BRANCH:-master}

+

+# python heat client library

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

+GITBRANCH["python-heatclient"]=${HEATCLIENT_BRANCH:-master}

+

+# ironic client

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

+GITBRANCH["python-ironicclient"]=${IRONICCLIENT_BRANCH:-master}

+

+# python keystone client library to nova that horizon uses

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

+GITBRANCH["python-keystoneclient"]=${KEYSTONECLIENT_BRANCH:-master}

+

+# neutron client

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

+GITBRANCH["python-neutronclient"]=${NEUTRONCLIENT_BRANCH:-master}

+

 # python client library to nova that horizon (and others) use

-NOVACLIENT_REPO=${NOVACLIENT_REPO:-${GIT_BASE}/openstack/python-novaclient.git}

-NOVACLIENT_BRANCH=${NOVACLIENT_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}

+

+# trove client library test

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

+GITBRANCH["python-troveclient"]=${TROVECLIENT_BRANCH:-master}

 # consolidated openstack python client

-OPENSTACKCLIENT_REPO=${OPENSTACKCLIENT_REPO:-${GIT_BASE}/openstack/python-openstackclient.git}

-OPENSTACKCLIENT_BRANCH=${OPENSTACKCLIENT_BRANCH:-master}

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

+GITBRANCH["python-openstackclient"]=${OPENSTACKCLIENT_BRANCH:-master}

+# this doesn't exist in a lib file, so set it here

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

+

+###################

+#

+#  Oslo Libraries

+#

+###################

 # cliff command line framework

-CLIFF_REPO=${CLIFF_REPO:-${GIT_BASE}/openstack/cliff.git}

-CLIFF_BRANCH=${CLIFF_BRANCH:-master}

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

+GITBRANCH["cliff"]=${CLIFF_BRANCH:-master}

 # oslo.config

-OSLOCFG_REPO=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}

-OSLOCFG_BRANCH=${OSLOCFG_BRANCH:-master}

+GITREPO["oslo.config"]=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}

+GITBRANCH["oslo.config"]=${OSLOCFG_BRANCH:-master}

+

+# oslo.db

+GITREPO["oslo.db"]=${OSLODB_REPO:-${GIT_BASE}/openstack/oslo.db.git}

+GITBRANCH["oslo.db"]=${OSLODB_BRANCH:-master}

+

+# oslo.i18n

+GITREPO["oslo.i18n"]=${OSLOI18N_REPO:-${GIT_BASE}/openstack/oslo.i18n.git}

+GITBRANCH["oslo.i18n"]=${OSLOI18N_BRANCH:-master}

+

+# oslo.log

+GITREPO["oslo.log"]=${OSLOLOG_REPO:-${GIT_BASE}/openstack/oslo.log.git}

+GITBRANCH["oslo.log"]=${OSLOLOG_BRANCH:-master}

 # oslo.messaging

-OSLOMSG_REPO=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}

-OSLOMSG_BRANCH=${OSLOMSG_BRANCH:-master}

+GITREPO["oslo.messaging"]=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}

+GITBRANCH["oslo.messaging"]=${OSLOMSG_BRANCH:-master}

 # oslo.rootwrap

-OSLORWRAP_REPO=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}

-OSLORWRAP_BRANCH=${OSLORWRAP_BRANCH:-master}

+GITREPO["oslo.rootwrap"]=${OSLORWRAP_REPO:-${GIT_BASE}/openstack/oslo.rootwrap.git}

+GITBRANCH["oslo.rootwrap"]=${OSLORWRAP_BRANCH:-master}

 # oslo.vmware

-OSLOVMWARE_REPO=${OSLOVMWARE_REPO:-${GIT_BASE}/openstack/oslo.vmware.git}

-OSLOVMWARE_BRANCH=${OSLOVMWARE_BRANCH:-master}

+GITREPO["oslo.vmware"]=${OSLOVMWARE_REPO:-${GIT_BASE}/openstack/oslo.vmware.git}

+GITBRANCH["oslo.vmware"]=${OSLOVMWARE_BRANCH:-master}

 # pycadf auditing library

-PYCADF_REPO=${PYCADF_REPO:-${GIT_BASE}/openstack/pycadf.git}

-PYCADF_BRANCH=${PYCADF_BRANCH:-master}

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

+GITBRANCH["pycadf"]=${PYCADF_BRANCH:-master}

 # stevedore plugin manager

-STEVEDORE_REPO=${STEVEDORE_REPO:-${GIT_BASE}/openstack/stevedore.git}

-STEVEDORE_BRANCH=${STEVEDORE_BRANCH:-master}

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

+GITBRANCH["stevedore"]=${STEVEDORE_BRANCH:-master}

 # taskflow plugin manager

-TASKFLOW_REPO=${TASKFLOW_REPO:-${GIT_BASE}/openstack/taskflow.git}

-TASKFLOW_BRANCH=${TASKFLOW_BRANCH:-master}

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

+GITBRANCH["taskflow"]=${TASKFLOW_BRANCH:-master}

 # pbr drives the setuptools configs

-PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}

-PBR_BRANCH=${PBR_BRANCH:-master}

+GITREPO["pbr"]=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}

+GITBRANCH["pbr"]=${PBR_BRANCH:-master}

-# neutron service

-NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}

-NEUTRON_BRANCH=${NEUTRON_BRANCH:-stable/icehouse}