openstack/devstack
Code Issues Proposed changes

Merge "Remove configuration parameter Q_DHCP_EXTRA_DEFAULT_OPTS"

Browse Source
This commit is contained in:
Jenkins 2014-07-28 00:08:48 +00:00 committed by Gerrit Code Review
commit c6a5126f4a
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/neutron
View File

@ -687,14 +687,6 @@ function _configure_neutron_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
# Define extra "DEFAULT" configuration options when q-dhcp is configured by
# defining the array ``Q_DHCP_EXTRA_DEFAULT_OPTS``.
# For Example: ``Q_DHCP_EXTRA_DEFAULT_OPTS=(foo=true bar=2)``
for I in "${Q_DHCP_EXTRA_DEFAULT_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax
iniset $Q_DHCP_CONF_FILE DEFAULT ${I/=/ }
done
_neutron_setup_interface_driver $Q_DHCP_CONF_FILE
neutron_plugin_configure_dhcp_agent

17
stack.sh
View File

@ -1426,23 +1426,6 @@ if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
done
fi
# TODO(dtroyer): Remove Q_DHCP_EXTRA_DEFAULT_OPTS after stable/icehouse branch is cut
if [[ -n "$Q_DHCP_EXTRA_DEFAULT_OPTS" ]]; then
echo ""
echo_summary "WARNING: Q_DHCP_EXTRA_DEFAULT_OPTS is used"
echo "You are using Q_DHCP_EXTRA_DEFAULT_OPTS to pass configuration into $Q_DHCP_CONF_FILE."
echo "Please convert that configuration in localrc to a $Q_DHCP_CONF_FILE section in local.conf:"
echo "Q_DHCP_EXTRA_DEFAULT_OPTS will be removed early in the Juno development cycle"
echo "
[[post-config|/\$Q_DHCP_CONF_FILE]]
[DEFAULT]
"
for I in "${Q_DHCP_EXTRA_DEFAULT_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax
echo ${I}
done
fi
# TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut
if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
echo ""