diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index fc680cfee..094311719 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -187,7 +187,6 @@ kolla_enable_neutron_agent_ha: True kolla_enable_neutron_bgp_dragent: True kolla_enable_neutron_dvr: True - kolla_enable_neutron_fwaas: True kolla_enable_neutron_provider_networks: True kolla_enable_neutron_qos: True kolla_enable_neutron_vpnaas: True @@ -321,7 +320,6 @@ #enable_neutron_agent_ha: True #enable_neutron_bgp_dragent: True #enable_neutron_dvr: True - #enable_neutron_fwaas: True #enable_neutron_provider_networks: True #enable_neutron_qos: True #enable_neutron_vpnaas: True diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 4a1bf1b4e..bc3922803 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -109,7 +109,6 @@ kolla_feature_flags: - horizon_congress - horizon_designate - horizon_freezer - - horizon_fwaas - horizon_heat - horizon_ironic - horizon_karbor @@ -162,7 +161,6 @@ kolla_feature_flags: - neutron_agent_ha - neutron_bgp_dragent - neutron_dvr - - neutron_fwaas - neutron_infoblox_ipam_agent - neutron_metering - neutron_port_forwarding diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 8a342dee9..66ea1cb99 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -221,7 +221,6 @@ #kolla_enable_horizon_congress: #kolla_enable_horizon_designate: #kolla_enable_horizon_freezer: -#kolla_enable_horizon_fwaas: #kolla_enable_horizon_heat: #kolla_enable_horizon_ironic: #kolla_enable_horizon_karbor: @@ -274,7 +273,6 @@ #kolla_enable_neutron_agent_ha: #kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_dvr: -#kolla_enable_neutron_fwaas: #kolla_enable_neutron_infoblox_ipam_agent: #kolla_enable_neutron_metering: #kolla_enable_neutron_port_forwarding: diff --git a/releasenotes/notes/remove-neutron-fwaas-0g6a327ae69e2117.yaml b/releasenotes/notes/remove-neutron-fwaas-0g6a327ae69e2117.yaml new file mode 100644 index 000000000..bf1704ffe --- /dev/null +++ b/releasenotes/notes/remove-neutron-fwaas-0g6a327ae69e2117.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``neutron-fwaas`` project is no longer maintained. This has been + retired and will be removed in the Victoria cycle.