openstack/devstack
Code Issues Proposed changes

Install openstackclient after other services

Browse Source 
Let's see whether openstackclient will trigger unneeded version bump for
clients if its installation is put below all other services that are
expected to intall client libraries on proper versions on their own.

Change-Id: Ifa774219b7057112fc794a5e3d93bc963c55ba90
This commit is contained in:
Ihar Hrachyshka 2015-02-20 16:23:15 +01:00
parent 86b3a920e9
commit 1ffa33210d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stack.sh
View File

@ -734,14 +734,6 @@ fi
# Install middleware
install_keystonemiddleware
# install the OpenStack client, needed for most setup commands
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.2'
fi
if is_service_enabled keystone; then
if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
@ -816,13 +808,22 @@ if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then
# don't be naive and add to existing line!
fi
# Extras Install
# --------------
# Phase: install
run_phase stack install
# install the OpenStack client, needed for most setup commands
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.2'
fi
if [[ $TRACK_DEPENDS = True ]]; then
$DEST/.venv/bin/pip freeze > $DEST/requires-post-pip
if ! diff -Nru $DEST/requires-pre-pip $DEST/requires-post-pip > $DEST/requires.diff; then