openstack
/
devstack
Code Issues Proposed changes

Merge "Remove explicit support for OneConvergence plugin"

This commit is contained in:
Jenkins 2015-10-08 06:05:32 +00:00 committed by Gerrit Code Review
parent 40643a52f0 c961e791c1
commit c756b5b5d4
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/neutron_plugins/oneconvergence
View File

@ -1,77 +0,0 @@
#!/bin/bash
#
# Neutron One Convergence plugin
# ------------------------------
# Save trace setting
OC_XTRACE=$(set +o | grep xtrace)
set +o xtrace
source $TOP_DIR/lib/neutron_plugins/ovs_base
Q_L3_ENABLED=true
Q_L3_ROUTER_PER_TENANT=true
Q_USE_NAMESPACE=true
function neutron_plugin_install_agent_packages {
_neutron_ovs_base_install_agent_packages
}
# Configure common parameters
function neutron_plugin_configure_common {
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/oneconvergence
Q_PLUGIN_CONF_FILENAME=nvsdplugin.ini
Q_PLUGIN_CLASS="neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2"
}
# Configure plugin specific information
function neutron_plugin_configure_service {
iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_ip $NVSD_IP
iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_port $NVSD_PORT
iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_user $NVSD_USER
iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_passwd $NVSD_PASSWD
}
function neutron_plugin_configure_debug_command {
_neutron_ovs_base_configure_debug_command
}
function neutron_plugin_setup_interface_driver {
local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
}
function has_neutron_plugin_security_group {
# 1 means False here
return 0
}
function setup_integration_bridge {
_neutron_ovs_base_setup_bridge $OVS_BRIDGE
}
function neutron_plugin_configure_dhcp_agent {
setup_integration_bridge
iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
}
function neutron_plugin_configure_l3_agent {
_neutron_ovs_base_configure_l3_agent
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
}
function neutron_plugin_configure_plugin_agent {
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-nvsd-agent"
_neutron_ovs_base_configure_firewall_driver
}
function neutron_plugin_create_nova_conf {
if ( is_service_enabled n-cpu && ! ( is_service_enabled q-dhcp )) ; then
setup_integration_bridge
fi
}
# Restore xtrace
$OC_XTRACE