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

 # set up default directories

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

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

 CINDER_DIR=$DEST/cinder

 # Cinder virtual environment

@@ -381,6 +382,13 @@ 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

@@ -441,6 +441,10 @@ SWIFT3_BRANCH=${SWIFT3_BRANCH:-master}

 GITREPO["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_REPO:-${GIT_BASE}/openstack/ceilometermiddleware.git}

 GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master}

+# os-brick library to manage local volume attaches

+GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}

+GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}

+

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

 #

@@ -39,7 +39,7 @@ ALL_LIBS+=" oslo.serialization python-saharaclient django_openstack_auth"

 ALL_LIBS+=" python-openstackclient oslo.rootwrap oslo.i18n"

 ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"

 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"

-ALL_LIBS+=" debtcollector"

+ALL_LIBS+=" debtcollector os-brick"

 # Generate the above list with

 # echo ${!GITREPO[@]}