openstack/neutron
Code Issues Proposed changes

devstack: switch to new NEUTRON_* variables

Browse Source 
Those are generally defined by new lib/neutron code.

Change-Id: I2dd0128267b8a836c392d7ac26ade5bd0f421997
Co-Authored-By: YAMAMOTO Takashi <yamamoto@midokura.com>
This commit is contained in:
Ihar Hrachyshka 2017-03-07 21:06:35 +00:00
parent 9b4e22bd64
commit abd38171ba
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/l2_agent
View File

@ -9,5 +9,5 @@ function plugin_agent_add_l2_agent_extension {
function configure_l2_agent { function configure_l2_agent {
iniset /$Q_PLUGIN_CONF_FILE agent extensions "$L2_AGENT_EXTENSIONS" iniset /$NEUTRON_CORE_PLUGIN_CONF agent extensions "$L2_AGENT_EXTENSIONS"
} }

2
devstack/lib/l2_agent_sriovnicswitch
View File

@ -1,4 +1,4 @@
SRIOV_AGENT_CONF="${Q_PLUGIN_CONF_PATH}/sriov_agent.ini" SRIOV_AGENT_CONF="${NEUTRON_CORE_PLUGIN_CONF_PATH}/sriov_agent.ini"
SRIOV_AGENT_BINARY="${NEUTRON_BIN_DIR}/neutron-sriov-nic-agent" SRIOV_AGENT_BINARY="${NEUTRON_BIN_DIR}/neutron-sriov-nic-agent"
function configure_l2_agent_sriovnicswitch { function configure_l2_agent_sriovnicswitch {

2
devstack/lib/macvtap_agent
View File

@ -33,7 +33,7 @@ function neutron_plugin_configure_l3_agent {
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {
# Only the NooPFirewallDriver is supported. If not set, the agent will # Only the NooPFirewallDriver is supported. If not set, the agent will
# terminate. # terminate.
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver noop iniset /$NEUTRON_CORE_PLUGIN_CONF securitygroup firewall_driver noop
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-macvtap-agent" AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-macvtap-agent"
} }

2
devstack/lib/qos
View File

@ -4,7 +4,7 @@ function configure_qos_service_plugin {
function configure_qos_core_plugin { function configure_qos_core_plugin {
configure_qos_$Q_PLUGIN configure_qos_$NEUTRON_CORE_PLUGIN
} }

15
devstack/plugin.sh
View File

@ -1,5 +1,12 @@
LIBDIR=$DEST/neutron/devstack/lib LIBDIR=$DEST/neutron/devstack/lib
if is_neutron_legacy_enabled; then
NEUTRON_CORE_PLUGIN=$Q_PLUGIN
NEUTRON_AGENT=$Q_AGENT
NEUTRON_CORE_PLUGIN_CONF_PATH=$Q_PLUGIN_CONF_PATH
NEUTRON_CORE_PLUGIN_CONF=$Q_PLUGIN_CONF_FILE
fi
source $LIBDIR/dns source $LIBDIR/dns
source $LIBDIR/flavors source $LIBDIR/flavors
source $LIBDIR/l2_agent source $LIBDIR/l2_agent
@ -11,8 +18,8 @@ source $LIBDIR/trunk
Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT) Q_BUILD_OVS_FROM_GIT=$(trueorfalse False Q_BUILD_OVS_FROM_GIT)
if [ -f $LIBDIR/${Q_AGENT}_agent ]; then if [ -f $LIBDIR/${NEUTRON_AGENT}_agent ]; then
source $LIBDIR/${Q_AGENT}_agent source $LIBDIR/${NEUTRON_AGENT}_agent
fi fi
if [[ "$1" == "stack" ]]; then if [[ "$1" == "stack" ]]; then
@ -30,7 +37,7 @@ if [[ "$1" == "stack" ]]; then
if is_service_enabled q-dns; then if is_service_enabled q-dns; then
configure_dns_extension configure_dns_extension
fi fi
if [[ "$Q_AGENT" == "openvswitch" ]] && \ if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
remove_ovs_packages remove_ovs_packages
compile_ovs True /usr /var compile_ovs True /usr /var
@ -50,7 +57,7 @@ if [[ "$1" == "stack" ]]; then
#Therefore we create new service, q-sriov-agt, and the q-agt should be OVS #Therefore we create new service, q-sriov-agt, and the q-agt should be OVS
#or linux bridge. #or linux bridge.
if is_service_enabled q-sriov-agt; then if is_service_enabled q-sriov-agt; then
configure_$Q_PLUGIN configure_$NEUTRON_CORE_PLUGIN
configure_l2_agent configure_l2_agent
configure_l2_agent_sriovnicswitch configure_l2_agent_sriovnicswitch
fi fi

2
neutron/tests/contrib/hooks/mtu
View File

@ -3,7 +3,7 @@
[neutron_plugin_options] [neutron_plugin_options]
available_type_drivers=flat,geneve,vlan,gre,local,vxlan available_type_drivers=flat,geneve,vlan,gre,local,vxlan
[[post-config|/$Q_PLUGIN_CONF_FILE]] [[post-config|/$NEUTRON_CORE_PLUGIN_CONF]]
[ml2] [ml2]
type_drivers=flat,geneve,vlan,gre,local,vxlan type_drivers=flat,geneve,vlan,gre,local,vxlan

2
neutron/tests/contrib/hooks/ovsfw
View File

@ -1,4 +1,4 @@
[[post-config|/$Q_PLUGIN_CONF_FILE]] [[post-config|/$NEUTRON_CORE_PLUGIN_CONF]]
[securitygroup] [securitygroup]
firewall_driver = openvswitch firewall_driver = openvswitch