openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow neutron-fwaas to be enabled in Neutron"

Browse Source
This commit is contained in:
Jenkins 2016-12-15 04:03:43 +00:00 committed by Gerrit Code Review
commit 7deee0485e
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -288,6 +288,7 @@ enable_murano: "no"
enable_neutron_vpnaas: "no" enable_neutron_vpnaas: "no"
enable_neutron_dvr: "no" enable_neutron_dvr: "no"
enable_neutron_lbaas: "no" enable_neutron_lbaas: "no"
enable_neutron_fwaas: "no"
enable_neutron_qos: "no" enable_neutron_qos: "no"
enable_neutron_agent_ha: "no" enable_neutron_agent_ha: "no"
enable_octavia: "no" enable_octavia: "no"

5
ansible/roles/neutron/templates/l3_agent.ini.j2
View File

@ -9,3 +9,8 @@ agent_mode = dvr
{% else %} {% else %}
agent_mode = legacy agent_mode = legacy
{% endif %} {% endif %}
{% if enable_neutron_fwaas | bool %}
[fwaas]
driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
enabled = True
{% endif %}

2
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -35,7 +35,7 @@ host = {{ ansible_hostname }}_{{ item }}
allow_overlapping_ips = true allow_overlapping_ips = true
core_plugin = ml2 core_plugin = ml2
service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %} service_plugins = router{% if enable_neutron_lbaas | bool %},neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2{% endif %}{% if enable_neutron_qos | bool %},qos{% endif %}{% if enable_neutron_vpnaas | bool %},neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin{% endif %}{% if neutron_plugin_agent == "sfc" %}flow_classifier,sfc{% endif %}{% if enable_neutron_fwaas | bool %},neutron.services.firewall.fwaas_plugin.FirewallPlugin{% endif %}
{% if enable_neutron_agent_ha | bool %} {% if enable_neutron_agent_ha | bool %}
dhcp_agents_per_network = {{ dhcp_agents_per_network }} dhcp_agents_per_network = {{ dhcp_agents_per_network }}

1
etc/kolla/globals.yml
View File

@ -146,6 +146,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_multipathd: "no" #enable_multipathd: "no"
#enable_neutron_dvr: "no" #enable_neutron_dvr: "no"
#enable_neutron_lbaas: "no" #enable_neutron_lbaas: "no"
#enable_neutron_fwaas: "no"
#enable_neutron_qos: "no" #enable_neutron_qos: "no"
#enable_neutron_agent_ha: "no" #enable_neutron_agent_ha: "no"
#enable_neutron_vpnaas: "no" #enable_neutron_vpnaas: "no"

3
releasenotes/notes/kolla-neutron-fwaas-751aad2dad2381fc.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- "Add support for neutron-fwaas. Set 'enable_neutron_fwaas: yes' to enable."