@@ -297,7 +297,7 @@ function _determine_config_server {

 }

 function _determine_config_l3 {

-    local opts="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE"

+    local opts="--config-file $NEUTRON_CONF --config-file $Q_L3_CONF_FILE"

     if is_service_enabled q-fwaas; then

         opts+=" --config-file $Q_FWAAS_CONF_FILE"

     fi

@@ -524,7 +524,7 @@ function start_mutnauq_l2_agent {

 }

 function start_mutnauq_other_agents {

-    run_process q-dhcp "$AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE"

+    run_process q-dhcp "$AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file $Q_DHCP_CONF_FILE"

     if is_service_enabled neutron-vpnaas; then

         :  # Started by plugin

@@ -532,8 +532,8 @@ function start_mutnauq_other_agents {

         run_process q-l3 "$AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)"

     fi

-    run_process q-meta "$AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE"

-    run_process q-lbaas "$AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"

+    run_process q-meta "$AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file $Q_META_CONF_FILE"

+    run_process q-lbaas "$AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file $LBAAS_AGENT_CONF_FILENAME"

     run_process q-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"

     if [ "$VIRT_DRIVER" = 'xenserver' ]; then

@@ -83,7 +83,7 @@ SUBNETPOOL_SIZE_V4=${SUBNETPOOL_SIZE_V4:-24}

 SUBNETPOOL_SIZE_V6=${SUBNETPOOL_SIZE_V6:-64}

 function _determine_config_l3 {

-    local opts="--config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE"

+    local opts="--config-file $NEUTRON_CONF --config-file $Q_L3_CONF_FILE"

     echo "$opts"

 }