Do not create an unnecessary file "ml2"
Previously when running devstack with Neutron ML2 plugin, an unnecessary file "ml2" is created in devstack directory. It is because when the first argument is not defined the second argument becomes the first one. This change moves the first "options" argument of populate_ml2_config to the last and checks the given options has a value before adding them to a file. Change-Id: I9ff40456798c42216d414d5f8d443e671ab7d497 Close-Bug: #1255853
This commit is contained in:
parent
3ae26652af
commit
130c90ed0b
@ -34,10 +34,13 @@ Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-}
|
|||||||
ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
|
ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
|
||||||
|
|
||||||
function populate_ml2_config() {
|
function populate_ml2_config() {
|
||||||
OPTS=$1
|
CONF=$1
|
||||||
CONF=$2
|
SECTION=$2
|
||||||
SECTION=$3
|
OPTS=$3
|
||||||
|
|
||||||
|
if [ -z "$OPTS" ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
for I in "${OPTS[@]}"; do
|
for I in "${OPTS[@]}"; do
|
||||||
# Replace the first '=' with ' ' for iniset syntax
|
# Replace the first '=' with ' ' for iniset syntax
|
||||||
iniset $CONF $SECTION ${I/=/ }
|
iniset $CONF $SECTION ${I/=/ }
|
||||||
@ -102,19 +105,17 @@ function neutron_plugin_configure_service() {
|
|||||||
# Since we enable the tunnel TypeDrivers, also enable a local_ip
|
# Since we enable the tunnel TypeDrivers, also enable a local_ip
|
||||||
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP
|
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP
|
||||||
|
|
||||||
populate_ml2_config mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS /$Q_PLUGIN_CONF_FILE ml2
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS
|
||||||
|
|
||||||
populate_ml2_config type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS /$Q_PLUGIN_CONF_FILE ml2
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS
|
||||||
|
|
||||||
populate_ml2_config $Q_SRV_EXTRA_OPTS /$Q_PLUGIN_CONF_FILE ml2
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 $Q_SRV_EXTRA_OPTS
|
||||||
|
|
||||||
populate_ml2_config $Q_ML2_PLUGIN_GRE_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_gre
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_gre $Q_ML2_PLUGIN_GRE_TYPE_OPTIONS
|
||||||
|
|
||||||
populate_ml2_config $Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_vxlan
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vxlan $Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS
|
||||||
|
|
||||||
if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" != "" ]; then
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vlan $Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS
|
||||||
populate_ml2_config $Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_vlan
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function has_neutron_plugin_security_group() {
|
function has_neutron_plugin_security_group() {
|
||||||
|
Loading…
Reference in New Issue
Block a user