openstack/devstack
Code Issues Proposed changes

Merge "scope warnings to only display if the services are enabled"

Browse Source
This commit is contained in:
Jenkins 2014-08-28 22:04:10 +00:00 committed by Gerrit Code Review
commit 78d7c60aea
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -1423,6 +1423,7 @@ if [[ -n "$DEPRECATED_TEXT" ]]; then
echo_summary "WARNING: $DEPRECATED_TEXT" echo_summary "WARNING: $DEPRECATED_TEXT"
fi fi
if is_service_enabled neutron; then
# TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut # TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
echo "" echo ""
@ -1456,7 +1457,9 @@ if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
echo ${I} echo ${I}
done done
fi fi
fi
if is_service_enabled cinder; then
# TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut # TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
echo "" echo ""
@ -1469,6 +1472,7 @@ if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1,lvm:lvmdriver-2 CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1,lvm:lvmdriver-2
" "
fi fi
fi
# Indicate how long this took to run (bash maintained variable ``SECONDS``) # Indicate how long this took to run (bash maintained variable ``SECONDS``)
echo_summary "stack.sh completed in $SECONDS seconds." echo_summary "stack.sh completed in $SECONDS seconds."