openstack/devstack
Code Issues Proposed changes

Merge "Remove configuration parameter Q_SRV_EXTRA_DEFAULT_OPTS"

Browse Source
This commit is contained in:
Jenkins
2014-07-26 19:44:51 +00:00
committed by Gerrit Code Review
parent 00ca11d63d a5b70a1082
commit fdcb410034
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/neutron
View File

@@ -816,14 +816,6 @@ function _configure_neutron_service {
iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
_neutron_setup_keystone $NEUTRON_CONF keystone_authtoken _neutron_setup_keystone $NEUTRON_CONF keystone_authtoken
# Define extra "DEFAULT" configuration options when q-svc is configured by
# defining the array ``Q_SRV_EXTRA_DEFAULT_OPTS``.
# For Example: ``Q_SRV_EXTRA_DEFAULT_OPTS=(foo=true bar=2)``
for I in "${Q_SRV_EXTRA_DEFAULT_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax
iniset $NEUTRON_CONF DEFAULT ${I/=/ }
done
# Configuration for neutron notifations to nova. # Configuration for neutron notifations to nova.
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_status_changes $Q_NOTIFY_NOVA_PORT_STATUS_CHANGES
iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES iniset $NEUTRON_CONF DEFAULT notify_nova_on_port_data_changes $Q_NOTIFY_NOVA_PORT_DATA_CHANGES

17
stack.sh
View File

@@ -1464,23 +1464,6 @@ if [[ -n "$Q_DHCP_EXTRA_DEFAULT_OPTS" ]]; then
done done
fi fi
# TODO(dtroyer): Remove Q_SRV_EXTRA_DEFAULT_OPTS after stable/icehouse branch is cut
if [[ -n "$Q_SRV_EXTRA_DEFAULT_OPTS" ]]; then
echo ""
echo_summary "WARNING: Q_SRV_EXTRA_DEFAULT_OPTS is used"
echo "You are using Q_SRV_EXTRA_DEFAULT_OPTS to pass configuration into $NEUTRON_CONF."
echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:"
echo "Q_SRV_EXTRA_DEFAULT_OPTS will be removed early in the Juno development cycle"
echo "
[[post-config|\$NEUTRON_CONF]]
[DEFAULT]
"
for I in "${Q_SRV_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 # 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 ""