openstack/devstack
Code Issues Proposed changes
b9f697719b
devstack/lib/neutron_plugins/embrane

44 lines
1.5 KiB
Plaintext
Raw Normal View History

add shebang lines to all lib files With gerrit 2.8, and the new change screen, this will trigger syntax highlighting in gerrit. Thus making reviewing code a lot nicer. Change-Id: Id238748417ffab53e02d59413dba66f61e724383
2014-12-05 14:25:28 -05:00
#!/bin/bash
#
Embrane Plugin Support Implements blueprint embrane-plugin-support This commit implements Embrane's Neutron plugin installation support in Devstack. This is an extension of the openvswitch installation module, which is used by the main plugin, and enables configuration by localrc Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:28:14 -08:00
# Neutron Embrane plugin
# ---------------------------
# Save trace setting
Namespace XTRACE commands I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695
2015-10-13 11:03:03 +11:00
_XTRACE_NEUTRON_EMBR=$(set +o | grep xtrace)
Embrane Plugin Support Implements blueprint embrane-plugin-support This commit implements Embrane's Neutron plugin installation support in Devstack. This is an extension of the openvswitch installation module, which is used by the main plugin, and enables configuration by localrc Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:28:14 -08:00
set +o xtrace
source $TOP_DIR/lib/neutron_plugins/openvswitch
Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938
2014-02-21 15:35:08 +11:00
function save_function {
Don't mix declaration and set of locals Ia0957b47187c3dcadd46154b17022c4213781112 proposes to have bashate find instances of setting a local value. The issue is that "local" always returns 0, thus hiding any failure in the commands running to set the variable. This is an automated replacement of such instances Depends-On: I676c805e8f0401f75cc5367eee83b3d880cdef81 Change-Id: I9c8912a8fd596535589b207d7fc553b9d951d3fe
2015-10-07 14:06:26 +11:00
local ORIG_FUNC
ORIG_FUNC=$(declare -f $1)
Embrane Plugin Support Implements blueprint embrane-plugin-support This commit implements Embrane's Neutron plugin installation support in Devstack. This is an extension of the openvswitch installation module, which is used by the main plugin, and enables configuration by localrc Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:28:14 -08:00
local NEW_FUNC="$2${ORIG_FUNC#$1}"
eval "$NEW_FUNC"
}
save_function neutron_plugin_configure_service _neutron_plugin_configure_service
Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938
2014-02-21 15:35:08 +11:00
function neutron_plugin_configure_common {
Embrane Plugin Support Implements blueprint embrane-plugin-support This commit implements Embrane's Neutron plugin installation support in Devstack. This is an extension of the openvswitch installation module, which is used by the main plugin, and enables configuration by localrc Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:28:14 -08:00
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/embrane
Q_PLUGIN_CONF_FILENAME=heleos_conf.ini
Q_PLUGIN_CLASS="neutron.plugins.embrane.plugins.embrane_ovs_plugin.EmbraneOvsPlugin"
}
Enforce function declaration format in bash8 Check that function calls look like ^function foo {$ in bash8, and fix all existing failures of that check. Add a note to HACKING.rst Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938
2014-02-21 15:35:08 +11:00
function neutron_plugin_configure_service {
Embrane Plugin Support Implements blueprint embrane-plugin-support This commit implements Embrane's Neutron plugin installation support in Devstack. This is an extension of the openvswitch installation module, which is used by the main plugin, and enables configuration by localrc Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:28:14 -08:00
_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
Namespace XTRACE commands I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695
2015-10-13 11:03:03 +11:00
$_XTRACE_NEUTRON_EMBR
Copy Permalink