@@ -59,6 +59,7 @@ GITDIR["tooz"]=$DEST/tooz

 # things like os-traits. We should rename this script to be more generic

 # and then fold os-brick into it also.

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

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

 # Support entry points installation of console scripts

 OSLO_BIN_DIR=$(get_python_exec_prefix)

@@ -120,6 +121,9 @@ function install_libs {

     #

     # os-traits for nova

     _install_lib_from_source "os-traits"

+    # os-brick for nova/cinder

+    _install_lib_from_source "os-brick"

+

     # etcd (because tooz does not have a hard dependency on these)

     pip_install etcd3

deleted file mode 100644

@@ -1,32 +0,0 @@

-#!/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_OS_BRICK=$(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

-}

-

-# Restore xtrace

-$_XTRACE_OS_BRICK

\ No newline at end of file

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

 source $TOP_DIR/lib/ldap

 source $TOP_DIR/lib/dstat

 source $TOP_DIR/lib/etcd3

-source $TOP_DIR/lib/os_brick

 # Extras Source

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

@@ -841,11 +840,6 @@ if is_service_enabled neutron nova horizon; then

     install_neutronclient

 fi

-# Install shared libraries

-if is_service_enabled cinder nova; then

-    install_os_brick

-fi

-

 # Setup TLS certs

 if is_service_enabled tls-proxy; then

     configure_CA