b8e250232e
Add two end-of-file checks to bash8. Firstly, alert if heredoc hasn't finished. Some heredocs were done like: --- sudo bash -c "cat <<EOF > foo ... EOF" --- (A better way to do this is "cat <<EOF | sudo tee ..." as it retains the usual heredoc layout in the code). The trailing quote was throwing the matching in bash8 off and it kept appending the next file as if it was still part of the heredoc. To avoid this, we check if we're still in a heredoc when we start a new file; if so raise an error and reset the heredoc status fresh. We track the state of the previous file, line and lineno so we can give a good error. --- E012: heredoc did not end before EOF: 'cat <<EOF' - lib/trove: L221 --- This includes fixes for the existing problem heredocs. A similar EOF check is to ensure the previous file ended with a newline. --- E004: file did not end with a newline: '$MY_XTRACE' - lib/neutron_plugins/embrane: L40 --- This requires only one fix Change-Id: I5e547d87b3921fc7ce6588c28f074e5c9f489c1f
41 lines
1.4 KiB
Plaintext
41 lines
1.4 KiB
Plaintext
# Neutron Embrane plugin
|
|
# ---------------------------
|
|
|
|
# Save trace setting
|
|
MY_XTRACE=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
source $TOP_DIR/lib/neutron_plugins/openvswitch
|
|
|
|
save_function() {
|
|
local ORIG_FUNC=$(declare -f $1)
|
|
local NEW_FUNC="$2${ORIG_FUNC#$1}"
|
|
eval "$NEW_FUNC"
|
|
}
|
|
|
|
save_function neutron_plugin_configure_service _neutron_plugin_configure_service
|
|
|
|
function neutron_plugin_configure_common() {
|
|
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/embrane
|
|
Q_PLUGIN_CONF_FILENAME=heleos_conf.ini
|
|
Q_DB_NAME="ovs_neutron"
|
|
Q_PLUGIN_CLASS="neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin"
|
|
}
|
|
|
|
function neutron_plugin_configure_service() {
|
|
_neutron_plugin_configure_service
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos esm_mgmt $HELEOS_ESM_MGMT
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos admin_username $HELEOS_ADMIN_USERNAME
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos admin_password $HELEOS_ADMIN_PASSWORD
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos router_image $HELEOS_ROUTER_IMAGE
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos mgmt_id $HELEOS_MGMT_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos inband_id $HELEOS_INBAND_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos oob_id $HELEOS_OOB_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos dummy_utif_id $HELEOS_DUMMY_UTIF_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos resource_pool_id $HELEOS_RESOURCE_POOL_ID
|
|
iniset /$Q_PLUGIN_CONF_FILE heleos async_requests $HELEOS_ASYNC_REQUESTS
|
|
}
|
|
|
|
# Restore xtrace
|
|
$MY_XTRACE
|