@@ -1519,6 +1519,18 @@ function get_python_exec_prefix {

     fi

 }

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

+# from the global-requirements specification.

+#

+# Uses globals ``REQUIREMENTS_DIR``

+#

+# pip_install_gr packagename

+function pip_install_gr {

+    local name=$1

+    local clean_name=$(get_from_global_requirements $name)

+    pip_install $clean_name

+}

+

 # Wrapper for ``pip install`` to set cache and proxy environment variables

 # Uses globals ``OFFLINE``, ``PIP_DOWNLOAD_CACHE``, ``PIP_USE_MIRRORS``,

 # ``TRACK_DEPENDS``, ``*_proxy``

@@ -1575,6 +1587,17 @@ function pip_install {

     fi

 }

+# get version of a package from global requirements file

+# get_from_global_requirements <package>

+function get_from_global_requirements {

+    local package=$1

+    local required_pkg=$(grep -h ^${package} $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1)

+    if [[ $required_pkg == ""  ]]; then

+        die $LINENO "Can't find package $package in requirements"

+    fi

+    echo $required_pkg

+}

+

 # should we use this library from their git repo, or should we let it

 # get pulled in via pip dependencies.

 function use_library_from_git {

@@ -162,7 +162,7 @@ function is_baremetal {

 # so that we can build the deployment kernel & ramdisk

 function prepare_baremetal_toolchain {

     if [[ $(type -P ramdisk-image-create) == "" ]]; then

-        pip_install diskimage_builder

+        pip_install_gr diskimage-builder

     fi

     local shellinabox_basename=$(basename $BM_SHELL_IN_A_BOX)

     if [[ ! -e $DEST/$shellinabox_basename ]]; then

@@ -47,7 +47,7 @@ fi

 # install_dib() - Collect source and prepare

 function install_dib {

-    pip_install diskimage-builder

+    pip_install_gr diskimage-builder

     git_clone $TIE_REPO $TIE_DIR $TIE_BRANCH

     git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH

@@ -178,8 +178,7 @@ function stop_horizon {

 # NOTE: It can be moved to common functions, but it is only used by compilation

 # of django_openstack_auth catalogs at the moment.

 function _prepare_message_catalog_compilation {

-    local babel_package=$(grep ^Babel $REQUIREMENTS_DIR/global-requirements.txt)

-    pip_install "$babel_package"

+    pip_install_gr Babel

 }

 # Restore xtrace

@@ -157,7 +157,7 @@ function install_ironicclient {

         sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-ironicclient"]}/tools/,/etc/bash_completion.d/}ironic.bash_completion

     else

         # nothing actually "requires" ironicclient, so force instally from pypi

-        pip_install python-ironicclient

+        pip_install_gr python-ironicclient

     fi

 }

@@ -622,7 +622,7 @@ function upload_baremetal_ironic_deploy {

     # install diskimage-builder

     if [[ $(type -P ramdisk-image-create) == "" ]]; then

-        pip_install diskimage_builder

+        pip_install_gr diskimage-builder

     fi

     if [ -z "$IRONIC_DEPLOY_KERNEL" -o -z "$IRONIC_DEPLOY_RAMDISK" ]; then

@@ -491,6 +491,9 @@ function install_keystonemiddleware {

     if use_library_from_git "keystonemiddleware"; then

         git_clone_by_name "keystonemiddleware"

         setup_dev_lib "keystonemiddleware"

+    else

+        # When not installing from repo, keystonemiddleware is still needed...

+        pip_install_gr keystonemiddleware

     fi

 }

@@ -138,7 +138,6 @@ function install_ldap {

         sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/cosine.ldif

         sudo ldapadd -Y EXTERNAL -H ldapi:/// -f /etc/openldap/schema/inetorgperson.ldif

     fi

-

     rm -rf $tmp_ldap_dir

 }

@@ -125,7 +125,7 @@ function install_rpc_backend {

         # TODO(kgiusti) can remove once python qpid bindings are

         # available on all supported platforms _and_ pyngus is added

         # to the requirements.txt file in oslo.messaging

-        pip_install pyngus

+        pip_install_gr pyngus

     fi

     if is_service_enabled rabbit; then

@@ -78,7 +78,8 @@ IPV6_SUBNET_ATTRIBUTES_ENABLED=$(trueorfalse True $IPV6_SUBNET_ATTRIBUTES_ENABLE

 # configure_tempest() - Set config files, create data dirs, etc

 function configure_tempest {

     # install testr since its used to process tempest logs

-    pip_install `grep -h testrepository $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1`

+    pip_install_gr testrepository

+

     local image_lines

     local images

     local num_images

@@ -869,7 +869,7 @@ if use_library_from_git "python-openstackclient"; then

     git_clone_by_name "python-openstackclient"

     setup_dev_lib "python-openstackclient"

 else

-    pip_install 'python-openstackclient==1.0.1'

+    pip_install_gr python-openstackclient

 fi