openstack/devstack
Code Issues Proposed changes

ofagent: Switch to IptablesFirewallDriver

Browse Source 
The latest version of ofagent
(ie. after blueprint ofagent-port-monitor)
follows IptablesFirewallDriver naming scheme.

Closes-Bug: #1364731
Related: blueprint ofagent-port-monitor
Change-Id: I690aab71b1cb222ffb8b458c90740ba623b0b37e
This commit is contained in:
YAMAMOTO Takashi 2014-07-23 16:39:28 +09:00
parent 0a49fa517b
commit fec7b15cf7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/neutron_plugins/ofagent_agent
View File

@ -34,10 +34,18 @@ function neutron_plugin_configure_l3_agent {
iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
} }
function _neutron_ofagent_configure_firewall_driver {
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
else
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
fi
}
function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_plugin_agent {
# Set up integration bridge # Set up integration bridge
_neutron_ovs_base_setup_bridge $OVS_BRIDGE _neutron_ovs_base_setup_bridge $OVS_BRIDGE
_neutron_ovs_base_configure_firewall_driver _neutron_ofagent_configure_firewall_driver
# Check a supported openflow version # Check a supported openflow version
OF_VERSION=`ovs-ofctl --version | grep "OpenFlow versions" | awk '{print $3}' | cut -d':' -f2` OF_VERSION=`ovs-ofctl --version | grep "OpenFlow versions" | awk '{print $3}' | cut -d':' -f2`