openstack
/
neutron-fwaas
Code Issues Proposed changes

Backward compatibility for fwaas 

Fwaas driver class is changed to one from this repo in case it attempts
to be loaded from neutron repo.

This change depends on I76af175c4387326a4e5ff95c2f15d8b866dedab3

Change-Id: If850adb3ec9db0a9ff0d43cd7445264c168d241c
Closes-Bug: 1401895
This commit is contained in:
Jakub Libosvar 2014-12-17 16:56:36 +01:00
parent cb418a3ead
commit 8d1c1c4a32
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron_fwaas/services/firewall/agents/l3reference/firewall_l3_agent.py
View File

@ -24,10 +24,13 @@ from neutron.extensions import firewall as fw_ext
from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.services import provider_configuration as provconf
from neutron_fwaas.services.firewall.agents import firewall_agent_api as api
LOG = logging.getLogger(__name__)
FIREWALL_DRIVERS = 'firewall_drivers'
class FWaaSL3PluginApi(api.FWaaSPluginApiMixin):
"""Agent side of the FWaaS agent to FWaaS Plugin RPC API."""
@ -55,7 +58,8 @@ class FWaaSL3AgentRpcCallback(api.FWaaSAgentRpcCallbackMixin):
def __init__(self, conf):
LOG.debug("Initializing firewall agent")
self.conf = conf
fwaas_driver_class_path = cfg.CONF.fwaas.driver
fwaas_driver_class_path = provconf.get_provider_driver_class(
cfg.CONF.fwaas.driver, FIREWALL_DRIVERS)
self.fwaas_enabled = cfg.CONF.fwaas.enabled
# None means l3-agent has no information on the server

6
setup.cfg
View File

@ -28,6 +28,12 @@ data_files =
setup-hooks =
pbr.hooks.setup_hook
[entry_points]
firewall_drivers =
# These are for backwards compat with Juno firewall service provider configuration values
neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas:IptablesFwaasDriver
neutron.services.firewall.drivers.varmour.varmour_fwaas.vArmourFwaasDriver = neutron_fwaas.services.firewall.drivers.varmour.varmour_fwaas:vArmourFwaasDriver
[build_sphinx]
all_files = 1
build-dir = doc/build