openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Remove the neutron-fwaas since it retired"

This commit is contained in:
Zuul 2020-07-08 02:15:30 +00:00 committed by Gerrit Code Review
parent 4859a9ab17 5fb6ef370e
commit 37353286f4
12 changed files with 1 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
defaults/main.yml
View File

@ -53,8 +53,6 @@ neutron_pip_package_state: "latest"
# Source git repo/branch settings
neutron_git_repo: https://opendev.org/openstack/neutron
neutron_git_install_branch: master
neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: master
neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: master
neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
@ -75,7 +73,6 @@ networking_generic_switch_git_install_branch: master
neutron_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
neutron_git_constraints:
- "git+{{ neutron_git_repo }}@{{ neutron_git_install_branch }}#egg=neutron"
- "git+{{ neutron_fwaas_git_repo }}@{{ neutron_fwaas_git_install_branch }}#egg=neutron-fwaas"
- "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
- "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
- "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
@ -419,13 +416,6 @@ nova_metadata_protocol: http
# this flag should be set to a boolean True.
nova_metadata_insecure: False
###
### FWaaS Configuration
###
neutron_driver_fwaasv2: iptables_v2
neutron_fwaasv2_service_provider: FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default
###
### VPNaaS Configuration
###

11
tasks/neutron_check.yml
View File

@ -13,15 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Ensure FWaaS v1 and v2 are not enabled simultaneously
fail:
message: |
FWaaS v1 and v2 cannot be enabled at the same time.
Verify that your neutron_plugin_base variable is correct.
when:
- neutron_fwaas | bool
- neutron_fwaas_v2 | bool
- name: Fail if service was deployed using a different installation method
fail:
msg: "Switching installation methods for OpenStack services is not supported"
@ -30,4 +21,4 @@
- ansible_local.openstack_ansible is defined
- ansible_local.openstack_ansible.neutron is defined
- ansible_local.openstack_ansible.neutron.install_method is defined
- ansible_local.openstack_ansible.neutron.install_method != neutron_install_method
- ansible_local.openstack_ansible.neutron.install_method != neutron_install_method

19
templates/l3_agent.ini.j2
View File

@ -24,25 +24,6 @@ enable_metadata_proxy = True
# L3 plugins
{% set l3_agent_plugins = [] %}
{% if neutron_fwaas | bool %}
# FWaaS
{% set _ = l3_agent_plugins.append("fwaas") %}
[fwaas]
enabled = true
driver = iptables
agent_version = v1
{% endif %}
{% if neutron_fwaas_v2 | bool %}
# FWaaS v2
{% set _ = l3_agent_plugins.append("fwaas_v2") %}
[fwaas]
enabled = true
driver = {{ neutron_driver_fwaasv2 }}
agent_version = v2
firewall_l2_driver = noop
{% endif %}
{% if neutron_vpnaas | bool %}
# VPNaaS
{% set _ = l3_agent_plugins.append("vpnaas") %}

3
templates/neutron.conf.j2
View File

@ -203,9 +203,6 @@ pool_timeout = {{ neutron_db_pool_timeout }}
{% if neutron_vpnaas | bool %}
service_provider = {{ neutron_vpnaas_service_provider }}
{% endif %}
{% if neutron_fwaas_v2 | bool %}
service_provider = {{ neutron_fwaasv2_service_provider }}
{% endif %}
{% endif %}

5
tests/neutron-overrides-ovs-fwaasv2.yml
View File

@ -9,14 +9,9 @@ tempest_plugins:
- name: neutron-plugins
repo: https://opendev.org/openstack/neutron-tempest-plugin
branch: master
- name: neutron-fwaas
repo: https://opendev.org/openstack/neutron-fwaas
branch: master
tempest_test_whitelist:
- "neutron_tempest_plugin.api.test_networks*"
- "neutron_fwaas.tests.tempest_plugin.tests.api.test_fwaasv2_extensions*"
- "neutron_fwaas.tests.tempest_plugin.tests.api.v2_base*"
tempest_network_ping_gateway: False

9
tox.ini
View File

@ -175,15 +175,6 @@ setenv =
commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:ovs-fwaasv2]
basepython = python3
setenv =
{[testenv]setenv}
ANSIBLE_INVENTORY={toxinidir}/tests/ovs_inventory
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-ovs-fwaasv2.yml
commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:linters]
basepython = python3
commands =

3
vars/debian.yml
View File

@ -83,9 +83,6 @@ neutron_optional_ovs_distro_packages:
neutron_optional_lxb_distro_packages:
- neutron-linuxbridge-agent
neutron_optional_fwaas_distro_packages:
- python-neutron-fwaas
neutron_optional_vpnaas_distro_packages:
- neutron-vpnaas-agent

10
vars/main.yml
View File

@ -50,9 +50,6 @@ neutron_optional_calico_pip_packages:
- networking-calico
- python-etcd
neutron_optional_fwaas_pip_packages:
- neutron_fwaas
neutron_optional_vpnaas_pip_packages:
- neutron_vpnaas
@ -77,9 +74,6 @@ neutron_venv_packages: >-
{%- if neutron_bgp | bool %}
{%- set _ = pkg_list.extend(neutron_optional_bgp_pip_packages) %}
{%- endif %}
{%- if (neutron_fwaas | bool) or (neutron_fwaas_v2 | bool) %}
{%- set _ = pkg_list.extend(neutron_optional_fwaas_pip_packages) %}
{%- endif %}
{%- if neutron_vpnaas | bool %}
{%- set _ = pkg_list.extend(neutron_optional_vpnaas_pip_packages) %}
{%- endif %}
@ -278,10 +272,6 @@ neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% els
### FWaaS Plugin Configuration
###
# Please add the 'firewall' to the neutron_plugin_base list
neutron_fwaas: "{{ ('firewall' in neutron_plugin_base) | ternary('True', 'False') }}"
neutron_fwaas_v2: "{{ ('firewall_v2' in neutron_plugin_base) | ternary('True', 'False') }}"
###
### VPNaaS Plugin Configuration
###

3
vars/redhat.yml
View File

@ -66,9 +66,6 @@ neutron_optional_ovs_distro_packages:
neutron_optional_lxb_distro_packages:
- openstack-neutron-linuxbridge
neutron_optional_fwaas_distro_packages:
- openstack-neutron-fwaas
neutron_optional_vpnaas_distro_packages:
- openstack-neutron-vpnaas

3
vars/suse.yml
View File

@ -87,9 +87,6 @@ neutron_optional_ovs_distro_packages:
neutron_optional_lxb_distro_packages:
- openstack-neutron-linuxbridge-agent
neutron_optional_fwaas_distro_packages:
- openstack-neutron-fwaas
neutron_option_vpnaas_distro_packages:
- openstack-neutron-vpnaas

6
zuul.d/jobs.yaml
View File

@ -64,9 +64,3 @@
parent: openstack-ansible-functional-ubuntu-bionic
vars:
tox_env: opendaylight-bgpvpn
- job:
name: openstack-ansible-ovs-fwaasv2-ubuntu-bionic
parent: openstack-ansible-functional-ubuntu-bionic
vars:
tox_env: ovs-fwaasv2

2
zuul.d/project.yaml
View File

@ -36,8 +36,6 @@
voting: false
- openstack-ansible-opendaylight-bgpvpn-ubuntu-bionic:
voting: false
- openstack-ansible-ovs-fwaasv2-ubuntu-bionic:
voting: false
gate:
jobs:
- openstack-ansible-ovs-ubuntu-bionic