openstack/devstack
Code Issues Proposed changes

Merge "Install openstackclient after other services"

Browse Source
This commit is contained in:
Jenkins 2015-02-24 04:14:54 +00:00 committed by Gerrit Code Review
commit b5d1de0a93
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

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