openstack/charm-neutron-gateway
Code Issues Proposed changes

Merge "Fix support for FWaaS for >= Newton"

Browse Source
This commit is contained in:
Zuul 2017-10-02 11:52:43 +00:00 committed by Gerrit Code Review
commit f39db13948
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/newton/fwaas_driver.ini Normal file
View File

@ -0,0 +1,9 @@
# newton
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
###############################################################################
[fwaas]
agent_version = v1
driver = iptables
enabled = True

3
templates/newton/l3_agent.ini
View File

@ -30,3 +30,6 @@ gateway_external_network_id = {{ ext_net_id }}
external_network_bridge = br-ex external_network_bridge = br-ex
{% endif -%} {% endif -%}
agent_mode = {{ agent_mode }} agent_mode = {{ agent_mode }}
[AGENT]
extensions = fwaas

6
tests/basic_deployment.py
View File

@ -679,7 +679,11 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
} }
section = 'fwaas' section = 'fwaas'
if self._get_openstack_release() >= self.trusty_kilo: if self._get_openstack_release() >= self.xenial_newton:
# Newton or later
expected['driver'] = 'iptables'
expected['agent_version'] = 'v1'
elif self._get_openstack_release() >= self.trusty_kilo:
# Kilo or later # Kilo or later
expected['driver'] = ('neutron_fwaas.services.firewall.drivers.' expected['driver'] = ('neutron_fwaas.services.firewall.drivers.'
'linux.iptables_fwaas.IptablesFwaasDriver') 'linux.iptables_fwaas.IptablesFwaasDriver')