From fec7b15cf778c23ee499c11f1e94d81966c5737c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 23 Jul 2014 16:39:28 +0900 Subject: [PATCH] ofagent: Switch to IptablesFirewallDriver 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 --- lib/neutron_plugins/ofagent_agent | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/neutron_plugins/ofagent_agent b/lib/neutron_plugins/ofagent_agent index b4c2ada873..a5a58f4c27 100644 --- a/lib/neutron_plugins/ofagent_agent +++ b/lib/neutron_plugins/ofagent_agent @@ -34,10 +34,18 @@ function neutron_plugin_configure_l3_agent { 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 { # Set up integration bridge _neutron_ovs_base_setup_bridge $OVS_BRIDGE - _neutron_ovs_base_configure_firewall_driver + _neutron_ofagent_configure_firewall_driver # Check a supported openflow version OF_VERSION=`ovs-ofctl --version | grep "OpenFlow versions" | awk '{print $3}' | cut -d':' -f2`