@@ -35,6 +35,7 @@ source $TOP_DIR/lib/rpc_backend

 source $TOP_DIR/lib/oslo

 source $TOP_DIR/lib/tls

+

 source $TOP_DIR/lib/horizon

 source $TOP_DIR/lib/keystone

 source $TOP_DIR/lib/glance

@@ -76,7 +77,6 @@ if [[ -d $TOP_DIR/extras.d ]]; then

 fi

 # Clean projects

-cleanup_oslo

 cleanup_cinder

 cleanup_glance

 cleanup_keystone

@@ -1269,12 +1269,26 @@ function safe_chmod() {

     _safe_permission_operation chmod $@

 }

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

+# use this, especially *oslo* ones

+function setup_install {

+    local project_dir=$1

+    setup_package_with_req_sync $project_dir

+}

+

+# this should be used for projects which run services, like all services

+function setup_develop {

+    local project_dir=$1

+    setup_package_with_req_sync $project_dir -e

+}

+

 # ``pip install -e`` the package, which processes the dependencies

 # using pip before running `setup.py develop`

 # Uses globals ``STACK_USER``, ``TRACK_DEPENDS``, ``REQUIREMENTS_DIR``

 # setup_develop directory

-function setup_develop() {

+function setup_package_with_req_sync() {

     local project_dir=$1

+    local flags=$2

     echo "cd $REQUIREMENTS_DIR; $SUDO_CMD python update.py $project_dir"

@@ -1287,9 +1301,11 @@ function setup_develop() {

             $SUDO_CMD python update.py $project_dir)

     fi

-    pip_install -e $project_dir

+    pip_install $flags $project_dir

     # ensure that further actions can do things like setup.py sdist

-    safe_chown -R $STACK_USER $1/*.egg-info

+    if [[ "$flags" == "-e" ]]; then

+        safe_chown -R $STACK_USER $1/*.egg-info

+    fi

     # Undo requirements changes, if we made them

     if [ $update_requirements -eq 0 ]; then

@@ -45,7 +45,7 @@ function install_infra() {

     # Install pbr

     git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH

-    setup_develop $PBR_DIR

+    setup_install $PBR_DIR

 }

 # Restore xtrace

@@ -27,15 +27,13 @@ OSLOMSG_DIR=$DEST/oslo.messaging

 # 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 $OSLOCFG_REPO $OSLOCFG_DIR $OSLOCFG_BRANCH

-    setup_develop $OSLOCFG_DIR

+    setup_install $OSLOCFG_DIR

     git_clone $OSLOMSG_REPO $OSLOMSG_DIR $OSLOMSG_BRANCH

-    setup_develop $OSLOMSG_DIR

+    setup_install $OSLOMSG_DIR

 }

 # cleanup_oslo() - purge possibly old versions of oslo

new file mode 100644

@@ -0,0 +1,68 @@

+# lib/stackforge

+#

+# Functions to install stackforge libraries that we depend on so

+# that we can try their git versions during devstack gate.

+#

+# This is appropriate for python libraries that release to pypi and are

+# expected to be used beyond OpenStack like, but are requirements

+# for core services in global-requirements.

+#

+#     * wsme

+#     * pecan

+#

+# This is not appropriate for stackforge projects which are early stage

+# OpenStack tools

+

+# Dependencies:

+# ``functions`` file

+

+# ``stack.sh`` calls the entry points in this order:

+#

+# install_stackforge

+

+# Save trace setting

+XTRACE=$(set +o | grep xtrace)

+set +o xtrace

+

+

+# Defaults

+# --------

+WSME_DIR=$DEST/wsme

+PECAN_DIR=$DEST/pecan

+

+# Entry Points

+# ------------

+

+# install_stackforge() - Collect source and prepare

+function install_stackforge {

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

+    # for a smoother transition of existing users.

+    cleanup_stackforge

+

+    git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH

+    setup_package $WSME_DIR

+

+    git_clone $PECAN_REPO $PECAN_DIR $PECAN_BRANCH

+    setup_package $PECAN_DIR

+}

+

+# cleanup_stackforge() - purge possibly old versions of stackforge libraries

+function cleanup_stackforge {

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

+    # otherwise python hates itself

+    for lib in wsme pecan; do

+        if ! python -c "import $lib" 2>/dev/null; then

+            echo "Found old $lib... removing to ensure consistency"

+            local PIP_CMD=$(get_pip_command)

+            pip_install $lib

+            sudo $PIP_CMD uninstall -y $lib

+        fi

+    done

+}

+

+# Restore xtrace

+$XTRACE

+

+# Local variables:

+# mode: shell-script

+# End: