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

70
stack.sh
View File

@ -1423,51 +1423,55 @@ if [[ -n "$DEPRECATED_TEXT" ]]; then
echo_summary "WARNING: $DEPRECATED_TEXT" echo_summary "WARNING: $DEPRECATED_TEXT"
fi fi
# TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut if is_service_enabled neutron; then
if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then # TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut
echo "" if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then
echo_summary "WARNING: Q_AGENT_EXTRA_AGENT_OPTS is used" echo ""
echo "You are using Q_AGENT_EXTRA_AGENT_OPTS to pass configuration into $NEUTRON_CONF." echo_summary "WARNING: Q_AGENT_EXTRA_AGENT_OPTS is used"
echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:" echo "You are using Q_AGENT_EXTRA_AGENT_OPTS to pass configuration into $NEUTRON_CONF."
echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle" echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:"
echo " echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle"
echo "
[[post-config|/\$Q_PLUGIN_CONF_FILE]] [[post-config|/\$Q_PLUGIN_CONF_FILE]]
[DEFAULT] [DEFAULT]
" "
for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax # Replace the first '=' with ' ' for iniset syntax
echo ${I} echo ${I}
done done
fi fi
# TODO(dtroyer): Remove Q_AGENT_EXTRA_SRV_OPTS after stable/juno branch is cut # TODO(dtroyer): Remove Q_AGENT_EXTRA_SRV_OPTS after stable/juno branch is cut
if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
echo "" echo ""
echo_summary "WARNING: Q_AGENT_EXTRA_SRV_OPTS is used" 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." echo "You are using Q_AGENT_EXTRA_SRV_OPTS to pass configuration into $NEUTRON_CONF."
echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:" echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:"
echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle" echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle"
echo " echo "
[[post-config|/\$Q_PLUGIN_CONF_FILE]] [[post-config|/\$Q_PLUGIN_CONF_FILE]]
[DEFAULT] [DEFAULT]
" "
for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax # Replace the first '=' with ' ' for iniset syntax
echo ${I} echo ${I}
done done
fi
fi fi
# TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut if is_service_enabled cinder; then
if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then # TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
echo "" if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
echo_summary "WARNING: CINDER_MULTI_LVM_BACKEND is used" echo ""
echo "You are using CINDER_MULTI_LVM_BACKEND to configure Cinder's multiple LVM backends" echo_summary "WARNING: CINDER_MULTI_LVM_BACKEND is used"
echo "Please convert that configuration in local.conf to use CINDER_ENABLED_BACKENDS." echo "You are using CINDER_MULTI_LVM_BACKEND to configure Cinder's multiple LVM backends"
echo "CINDER_ENABLED_BACKENDS will be removed early in the 'K' development cycle" echo "Please convert that configuration in local.conf to use CINDER_ENABLED_BACKENDS."
echo " echo "CINDER_ENABLED_BACKENDS will be removed early in the 'K' development cycle"
echo "
[[local|localrc]] [[local|localrc]]
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``)