@@ -39,7 +39,6 @@ fi

 # set up default directories

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

-GITDIR["os-brick"]=$DEST/os-brick

 GITDIR["python-brick-cinderclient-ext"]=$DEST/python-brick-cinderclient-ext

 CINDER_DIR=$DEST/cinder

@@ -445,13 +444,6 @@ function init_cinder {

 # install_cinder() - Collect source and prepare

 function install_cinder {

-    # Install os-brick from git so we make sure we're testing

-    # the latest code.

-    if use_library_from_git "os-brick"; then

-        git_clone_by_name "os-brick"

-        setup_dev_lib "os-brick"

-    fi

-

     git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH

     setup_develop $CINDER_DIR

     if [ "$CINDER_ISCSI_HELPER" = "tgtadm" ]; then

new file mode 100644

@@ -0,0 +1,29 @@

+#!/bin/bash

+#

+# lib/os_brick

+# Install **os-brick** python module from source

+

+# Dependencies:

+#

+# - functions

+# - DEST, DATA_DIR must be defined

+

+# stack.sh

+# ---------

+# - install_os_brick

+

+# Save trace setting

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

+set +o xtrace

+

+

+GITDIR["os-brick"]=$DEST/os-brick

+

+# Install os_brick from git only if requested, otherwise it will be pulled from

+# pip repositories by requirements of projects that need it.

+function install_os_brick {

+    if use_library_from_git "os-brick"; then

+        git_clone_by_name "os-brick"

+        setup_dev_lib "os-brick"

+    fi

+}

@@ -570,6 +570,7 @@ source $TOP_DIR/lib/neutron-legacy

 source $TOP_DIR/lib/ldap

 source $TOP_DIR/lib/dstat

 source $TOP_DIR/lib/dlm

+source $TOP_DIR/lib/os_brick

 # Extras Source

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

@@ -796,6 +797,11 @@ if is_service_enabled heat horizon; then

     install_heatclient

 fi

+# Install shared libraries

+if is_service_enabled cinder nova; then

+    install_os_brick

+fi

+

 # Install middleware

 install_keystonemiddleware