Remove FWaaS v1 related options

Neutron FWaaS v1 is deprecated and removed since stein cycle by [0]. So
remove related options in kolla.

[0] https://review.opendev.org/616410

Change-Id: Ia03e7979dd48bafb34c11edd08c2a2a87b949e0e
(cherry picked from commit 1537f6ed66)
This commit is contained in:
Jeffrey Zhang 2019-07-01 17:48:22 +08:00 committed by Radosław Piliszek
parent df49f8d67a
commit 28ce9dc727
3 changed files with 9 additions and 14 deletions

View File

@ -304,9 +304,6 @@ ironic_neutron_agent_dimensions: "{{ default_container_dimensions }}"
dhcp_agents_per_network: 2
max_l3_agents_per_router: 3
# valid value is: ["v1", "v2"]
neutron_fwaas_version: "v1"
neutron_admin_endpoint: "{{ admin_protocol }}://{{ neutron_internal_fqdn }}:{{ neutron_server_port }}"
neutron_internal_endpoint: "{{ internal_protocol }}://{{ neutron_internal_fqdn }}:{{ neutron_server_port }}"
neutron_public_endpoint: "{{ public_protocol }}://{{ neutron_external_fqdn }}:{{ neutron_server_port }}"
@ -342,10 +339,8 @@ neutron_rolling_upgrade_services: ["neutron", "neutron-fwaas", "neutron-vpnaas"]
# Service Plugins
####################
service_plugins:
- name: "firewall"
enabled: "{{ enable_neutron_fwaas | bool and neutron_fwaas_version == 'v1' }}"
- name: "firewall_v2"
enabled: "{{ enable_neutron_fwaas | bool and neutron_fwaas_version == 'v2' }}"
enabled: "{{ enable_neutron_fwaas }}"
- name: "flow_classifier"
enabled: "{{ enable_neutron_sfc | bool }}"
- name: "lbaasv2"
@ -396,10 +391,8 @@ agent_extensions:
neutron_agent_extensions: "{{ agent_extensions | selectattr('enabled', 'equalto', true) | list }}"
l3_agent_extensions:
- name: "fwaas"
enabled: "{{ enable_neutron_fwaas | bool and neutron_fwaas_version == 'v1' }}"
- name: "fwaas_v2"
enabled: "{{ enable_neutron_fwaas | bool and neutron_fwaas_version == 'v2' }}"
enabled: "{{ enable_neutron_fwaas | bool }}"
- name: "vpnaas"
enabled: "{{ enable_neutron_vpnaas | bool }}"

View File

@ -4,13 +4,8 @@ enabled = True
{% if neutron_plugin_agent == 'vmware_nsxv' %}
driver = vmware_nsxv_edge
{% else %}
{% if neutron_fwaas_version == 'v1' %}
agent_version = v1
driver = iptables
{% elif neutron_fwaas_version == 'v2' %}
agent_version = v2
driver = iptables_v2
{% endif %}
[service_providers]
{% if neutron_fwaas_version == 'v1' %}

View File

@ -0,0 +1,7 @@
---
deprecations:
- |
Neutron FWaaS v1 is deprecated and removed since stein cycle by [0]. So
remove related options in kolla.
[0] https://review.opendev.org/616410