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

18
stack.sh
View File

@ -1423,8 +1423,9 @@ if [[ -n "$DEPRECATED_TEXT" ]]; then
echo_summary "WARNING: $DEPRECATED_TEXT"
fi
# TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
if is_service_enabled neutron; then
# TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
echo ""
echo_summary "WARNING: Q_AGENT_EXTRA_AGENT_OPTS is used"
echo "You are using Q_AGENT_EXTRA_AGENT_OPTS to pass configuration into $NEUTRON_CONF."
@ -1438,10 +1439,10 @@ if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
# Replace the first '=' with ' ' for iniset syntax
echo ${I}
done
fi
fi
# TODO(dtroyer): Remove Q_AGENT_EXTRA_SRV_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
# TODO(dtroyer): Remove Q_AGENT_EXTRA_SRV_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
echo ""
echo_summary "WARNING: Q_AGENT_EXTRA_SRV_OPTS is used"
echo "You are using Q_AGENT_EXTRA_SRV_OPTS to pass configuration into $NEUTRON_CONF."
@ -1455,10 +1456,12 @@ if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
# Replace the first '=' with ' ' for iniset syntax
echo ${I}
done
fi
fi
# TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
if is_service_enabled cinder; then
# TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
echo ""
echo_summary "WARNING: CINDER_MULTI_LVM_BACKEND is used"
echo "You are using CINDER_MULTI_LVM_BACKEND to configure Cinder's multiple LVM backends"
@ -1468,6 +1471,7 @@ if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
[[local|localrc]]
CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1,lvm:lvmdriver-2
"
fi
fi
# Indicate how long this took to run (bash maintained variable ``SECONDS``)