openstack/openstack-ansible
Code Issues Proposed changes

Remove Neutron LBaaS v2 support

Browse Source 
Change-Id: I102af360bdd246523517303ebdd34406c9f62fa1
This commit is contained in:
Logan V 2019-05-16 15:37:29 -05:00
parent 96852cfcc9
commit d178cbccc8
9 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/admin/openstack-operations/verify-deploy.rst
View File

@ -130,7 +130,6 @@ the OpenStack API and dashboard, as an administrator.
| ID | Agent Type | Host | Availability Zone | Alive | State | Binary |
+--------------------------------------+----------------------+----------------------------------------+-------------------+-------+-------+---------------------------+
| 262b29fe-e60e-44b0-ae3c-065565f8deb7 | Metering agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-metering-agent |
| 3f305216-46ea-42c4-9f9f-9910f58323ea | Loadbalancerv2 agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-lbaasv2-agent |
| 41135f7f-9e6c-4122-b6b3-d131bfaae53e | Linux bridge agent | ubuntu-xenial | None | :-) | UP | neutron-linuxbridge-agent |
| 615d12a8-e738-490a-8552-2a03c8544b51 | Metadata agent | aio1-neutron-agents-container-2b0569d5 | None | :-) | UP | neutron-metadata-agent |
| 99b2abd3-a330-4ca7-b524-ed176c10b31c | DHCP agent | aio1-neutron-agents-container-2b0569d5 | nova | :-) | UP | neutron-dhcp-agent |

4
inventory/env.d/neutron.yml
View File

@ -32,9 +32,6 @@ component_skel:
neutron_l3_agent:
belongs_to:
- neutron_all
neutron_lbaas_agent:
belongs_to:
- neutron_all
neutron_bgp_dragent:
belongs_to:
- neutron_all
@ -60,7 +57,6 @@ container_skel:
- neutron_bgp_dragent
- neutron_dhcp_agent
- neutron_l3_agent
- neutron_lbaas_agent
- neutron_linuxbridge_agent
- neutron_metadata_agent
- neutron_metering_agent

3
inventory/group_vars/horizon_all.yml
View File

@ -23,9 +23,6 @@ horizon_enable_manila_ui: "{{ (groups['manila_all'] is defined) and (groups['man
horizon_enable_masakari_ui: "{{ (groups['masakari_all'] is defined) and (groups['masakari_all'] | length > 0) }}"
horizon_enable_designate_ui: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"
horizon_enable_octavia_ui: "{{ (groups['octavia-infra_all'] is defined) and (groups['octavia-infra_all'] | length > 0) }}"
# NOTE(mhayden): neutron-lbaas is a separate plugin and requires the full
# namespace to be specified. Also, LBaaS v1 was removed in Newton.
horizon_enable_neutron_lbaas: "{{ neutron_plugin_base is defined and 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base }}"
horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and (neutron_plugin_base | intersect(['firewall', 'firewall_v2']) | length > 0) }}"
horizon_enable_neutron_vpnaas: "{{ neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base }}"
horizon_enable_ha_router: "{{ neutron_plugin_type.split('.')[0] == 'ml2' and (groups['neutron_l3_agent'] | length >= 2) }}"

2
inventory/group_vars/neutron_all.yml
View File

@ -23,5 +23,3 @@ neutron_service_in_ldap: "{{ service_ldap_backend_enabled }}"
# Ensure that the package state matches the global setting
neutron_package_state: "{{ package_state }}"
neutron_lbaas_octavia: "{{ (groups['octavia_all'] is defined) and (groups['octavia_all'] | length > 0) }}"

2
inventory/inventory.ini
View File

@ -160,7 +160,6 @@ neutron_agent
neutron_bgp_dragent
neutron_dhcp_agent
neutron_l3_agent
neutron_lbaas_agent
neutron_linuxbridge_agent
neutron_metadata_agent
neutron_metering_agent
@ -173,7 +172,6 @@ neutron_sriov_nic_agent
[neutron_bgp_dragent]
[neutron_dhcp_agent]
[neutron_l3_agent]
[neutron_lbaas_agent]
[neutron_linuxbridge_agent]
[neutron_metadata_agent]
[neutron_metering_agent]

11
playbooks/defaults/repo_packages/openstack_services.yml
View File

@ -121,12 +121,6 @@ masakari_dashboard_git_install_branch: e05a1822db99178f79108b26625029cce477b441
masakari_dashboard_git_project_group: horizon_all
masakari_dashboard_git_track_branch: master # Not branched yet
## Horizon LBaaS dashboard plugin
neutron_lbaas_dashboard_git_repo: https://opendev.org/openstack/neutron-lbaas-dashboard
neutron_lbaas_dashboard_git_install_branch: ae51e99b03306f256e330e9480b72ae6e7f91535 # HEAD as of 29.03.2019
neutron_lbaas_dashboard_git_project_group: horizon_all
neutron_lbaas_dashboard_git_track_branch: master
## Horizon FWaaS dashboard plugin
neutron_fwaas_dashboard_git_repo: https://opendev.org/openstack/neutron-fwaas-dashboard
neutron_fwaas_dashboard_git_install_branch: 87b27591dc79552166f2410ae0efda36f1ff2b8d # HEAD as of 29.03.2019
@ -160,11 +154,6 @@ neutron_git_install_branch: 4da4d5e0f0c2eb49b8929119776d16504229a4c3 # HEAD as o
neutron_git_project_group: neutron_all
neutron_git_track_branch: master
neutron_lbaas_git_repo: https://opendev.org/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: e21efe39f2bab37838ad0c00d637ab88b609e822 # HEAD as of 29.03.2019
neutron_lbaas_git_project_group: neutron_all
neutron_lbaas_git_track_branch: master
neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: acf8d1948570a2092629b5ee97d418e9153b3877 # HEAD as of 29.03.2019
neutron_vpnaas_git_project_group: neutron_all

5
releasenotes/notes/lbaas-removal-e82da645325af648.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The deprecated Neutron LBaaS v2 plugin support has been removed from
openstack-ansible.

5
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -223,17 +223,12 @@ openstack_user_kernel_options:
value: '4 1 7 4'
{% if 'octaviav2' in bootstrap_host_scenario %}
# Disable Octavia support in Neutron
neutron_lbaas_octavia: False
# Disable LBaaS V2
neutron_lbaasv2: False
# Enable Octavia V2 API/standalone
octavia_v2: True
# Disable Octavia V1 API
octavia_v1: False
octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}"
{% elif 'octavia' in bootstrap_host_scenarios_expanded %}
neutron_lbaas_octavia: True
octavia_management_net_subnet_cidr: "{{ (bootstrap_host_container_tech == 'nspawn') | ternary('172.29.240.0/22', '172.29.252.0/22') }}"
{% endif %}

1
tests/test_inventory.py
View File

@ -380,7 +380,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'neutron_bgp_dragent',
'neutron_dhcp_agent',
'neutron_l3_agent',
'neutron_lbaas_agent',
'neutron_linuxbridge_agent',
'neutron_metadata_agent',
'neutron_metering_agent',