@@ -69,6 +69,20 @@ function pip_install_gr {

     pip_install $clean_name

 }

+# Wrapper for ``pip install`` that only installs versions of libraries

+# from the global-requirements specification with extras.

+#

+# Uses globals ``REQUIREMENTS_DIR``

+#

+# pip_install_gr_extras packagename extra1,extra2,...

+function pip_install_gr_extras {

+    local name=$1

+    local extras=$2

+    local clean_name

+    clean_name=$(get_from_global_requirements $name)

+    pip_install $clean_name[$extras]

+}

+

 # Determine the python versions supported by a package

 function get_python_versions_for_package {

     local name=$1

@@ -373,6 +373,13 @@ function configure_cinder {

     iniset $CINDER_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD"

     iniset $CINDER_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"

     iniset $CINDER_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"

+

+    # Set the backend url according to the configured dlm backend

+    if is_dlm_enabled; then

+        if [[ "$(dlm_backend)" == "zookeeper" ]]; then

+            iniset $CINDER_CONF coordination backend_url "zookeeper://${SERVICE_HOST}:2181"

+        fi

+    fi

 }

 # create_cinder_accounts() - Set up common required cinder accounts

@@ -91,6 +91,7 @@ function configure_dlm {

 # install_dlm() - Collect source and prepare

 function install_dlm {

     if is_dlm_enabled; then

+        pip_install_gr_extras tooz zookeeper

         if is_ubuntu; then

             install_package zookeeperd

         elif is_fedora; then