openstack
/
kolla-ansible
Code Issues Proposed changes

Remove Neutron LBaaS support 

The project has been retired and there will be no Train release [1].
This patch removes Neutron LBaaS support in Kolla.

[1] https://review.opendev.org/#/c/658494/

Change-Id: Ic0d3da02b9556a34d8c27ca21a1ebb3af1f5d34c
This commit is contained in:
Carlos Goncalves 2019-06-07 11:51:33 +02:00 committed by Mark Goddard
parent d2ae42ce6d
commit f427920daf
20 changed files with 24 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -560,7 +560,6 @@ enable_horizon_magnum: "{{ enable_magnum | bool }}"
enable_horizon_manila: "{{ enable_manila | bool }}"
enable_horizon_mistral: "{{ enable_mistral | bool }}"
enable_horizon_murano: "{{ enable_murano | bool }}"
enable_horizon_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}"
enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}"
enable_horizon_octavia: "{{ enable_octavia | bool }}"
enable_horizon_qinling: "{{ enable_qinling | bool }}"
@ -597,7 +596,6 @@ enable_murano: "no"
enable_neutron_vpnaas: "no"
enable_neutron_sriov: "no"
enable_neutron_dvr: "no"
enable_neutron_lbaas: "no"
enable_neutron_fwaas: "no"
enable_neutron_qos: "no"
enable_neutron_agent_ha: "no"

3
ansible/inventory/all-in-one
View File

@ -298,9 +298,6 @@ neutron
[neutron-l3-agent:children]
neutron
[neutron-lbaas-agent:children]
neutron
[neutron-metadata-agent:children]
neutron

3
ansible/inventory/multinode
View File

@ -317,9 +317,6 @@ neutron
[neutron-l3-agent:children]
neutron
[neutron-lbaas-agent:children]
neutron
[neutron-metadata-agent:children]
neutron

1
ansible/roles/horizon/defaults/main.yml
View File

@ -21,7 +21,6 @@ horizon_services:
ENABLE_MANILA: "{{ 'yes' if enable_horizon_manila | bool else 'no' }}"
ENABLE_MISTRAL: "{{ 'yes' if enable_horizon_mistral | bool else 'no' }}"
ENABLE_MURANO: "{{ 'yes' if enable_horizon_murano | bool else 'no' }}"
ENABLE_NEUTRON_LBAAS: "{{ 'yes' if enable_horizon_neutron_lbaas | bool else 'no' }}"
ENABLE_NEUTRON_VPNAAS: "{{ 'yes' if enable_horizon_neutron_vpnaas | bool else 'no' }}"
ENABLE_OCTAVIA: "{{ 'yes' if enable_horizon_octavia | bool else 'no' }}"
ENABLE_QINLING: "{{ 'yes' if enable_horizon_qinling | bool else 'no' }}"

24
ansible/roles/neutron/defaults/main.yml
View File

@ -98,15 +98,6 @@ neutron_services:
}}
volumes: "{{ neutron_l3_agent_default_volumes + neutron_l3_agent_extra_volumes }}"
dimensions: "{{ neutron_l3_agent_dimensions }}"
neutron-lbaas-agent:
container_name: "neutron_lbaas_agent"
image: "{{ neutron_lbaas_agent_image_full }}"
privileged: True
enabled: "{{ enable_neutron_lbaas | bool and not enable_octavia | bool and neutron_plugin_agent not in ['vmware_nsxv', 'vmware_dvs'] }}"
group: "neutron-lbaas-agent"
host_in_groups: "{{ inventory_hostname in groups['neutron-lbaas-agent'] }}"
volumes: "{{ neutron_lbaas_agent_default_volumes + neutron_lbaas_agent_extra_volumes }}"
dimensions: "{{ neutron_lbaas_agent_dimensions }}"
neutron-sriov-agent:
container_name: "neutron_sriov_agent"
image: "{{ neutron_sriov_agent_image_full }}"
@ -186,10 +177,6 @@ neutron_l3_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
neutron_l3_agent_tag: "{{ neutron_tag }}"
neutron_l3_agent_image_full: "{{ neutron_l3_agent_image }}:{{ neutron_l3_agent_tag }}"
neutron_lbaas_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ neutron_install_type }}-neutron-lbaas-agent"
neutron_lbaas_agent_tag: "{{ neutron_tag }}"
neutron_lbaas_agent_image_full: "{{ neutron_lbaas_agent_image }}:{{ neutron_lbaas_agent_tag }}"
neutron_sriov_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ neutron_install_type }}-neutron-sriov-agent"
neutron_sriov_agent_tag: "{{ neutron_tag }}"
neutron_sriov_agent_image_full: "{{ neutron_sriov_agent_image }}:{{ neutron_sriov_agent_tag }}"
@ -228,7 +215,6 @@ ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neu
neutron_dhcp_agent_dimensions: "{{ default_container_dimensions }}"
neutron_l3_agent_dimensions: "{{ default_container_dimensions }}"
neutron_lbaas_agent_dimensions: "{{ default_container_dimensions }}"
neutron_sriov_agent_dimensions: "{{ default_container_dimensions }}"
neutron_linuxbridge_agent_dimensions: "{{ default_container_dimensions }}"
neutron_metadata_agent_dimensions: "{{ default_container_dimensions }}"
@ -256,11 +242,6 @@ neutron_l3_agent_default_volumes:
- "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python2.7/site-packages/neutron' if neutron_dev_mode | bool else '' }}"
neutron_lbaas_agent_default_volumes:
- "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
neutron_sriov_agent_default_volumes:
- "{{ node_config_directory }}/neutron-sriov-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
@ -324,7 +305,6 @@ ironic_neutron_agent_default_volumes:
neutron_extra_volumes: "{{ default_extra_volumes }}"
neutron_dhcp_agent_extra_volumes: "{{ neutron_extra_volumes }}"
neutron_l3_agent_extra_volumes: "{{ neutron_extra_volumes }}"
neutron_lbaas_agent_extra_volumes: "{{ neutron_extra_volumes }}"
neutron_sriov_agent_extra_volumes: "{{ neutron_extra_volumes }}"
neutron_linuxbridge_agent_extra_volumes: "{{ neutron_extra_volumes }}"
neutron_metadata_agent_extra_volumes: "{{ neutron_extra_volumes }}"
@ -386,10 +366,6 @@ service_plugins:
enabled: "{{ enable_neutron_fwaas | bool and neutron_fwaas_version == 'v2' }}"
- name: "flow_classifier"
enabled: "{{ enable_neutron_sfc | bool }}"
- name: "lbaasv2"
enabled: "{{ enable_neutron_lbaas | bool and not enable_octavia | bool }}"
- name: "lbaasv2-proxy"
enabled: "{{ enable_neutron_lbaas | bool and enable_octavia | bool }}"
- name: "metering"
enabled: "{{ enable_neutron_metering | bool }}"
- name: "neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin"

31
ansible/roles/neutron/handlers/main.yml
View File

@ -5,7 +5,6 @@
service: "{{ neutron_services[service_name] }}"
config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_lbaas_conf: "{{ neutron_lbaas_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_vpnaas_conf: "{{ neutron_vpnaas_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
@ -25,7 +24,6 @@
- service.host_in_groups | bool
- config_json is changed
or neutron_conf is changed
or neutron_lbaas_conf is changed
or neutron_vpnaas_conf is changed
or neutron_ml2_conf is changed
or nsx_ini is changed
@ -208,35 +206,6 @@
or neutron_l3_agent_wrapper is changed
or neutron_l3_agent_container is changed
- name: Restart neutron-lbaas-agent container
vars:
service_name: "neutron-lbaas-agent"
service: "{{ neutron_services[service_name] }}"
config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_lbaas_conf: "{{ neutron_lbaas_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
neutron_lbaas_agent_container: "{{ check_neutron_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
- service.enabled | bool
- service.host_in_groups | bool
- config_json is changed
or neutron_conf is changed
or neutron_lbaas_conf is changed
or neutron_lbaas_agent_ini is changed
or policy_json is changed
or neutron_lbaas_agent_container is changed
- name: Restart neutron-sriov-agent container
vars:
service_name: "neutron-sriov-agent"

23
ansible/roles/neutron/tasks/bootstrap_service.yml
View File

@ -21,29 +21,6 @@
when: (kolla_action == "deploy")
or (not neutron_enable_rolling_upgrade | bool)
- name: Running Neutron lbaas bootstrap container
vars:
neutron_lbaas_agent: "{{ neutron_services['neutron-lbaas-agent'] }}"
become: true
kolla_docker:
action: "start_container"
common_options: "{{ docker_common_options }}"
detach: False
environment:
KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
image: "{{ neutron_lbaas_agent.image }}"
labels:
BOOTSTRAP:
name: "bootstrap_neutron_lbaas_agent"
restart_policy: "never"
volumes: "{{ neutron_lbaas_agent.volumes }}"
when:
- neutron_lbaas_agent.enabled | bool
- neutron_lbaas_agent.host_in_groups | bool
run_once: True
delegate_to: "{{ groups[neutron_lbaas_agent.group][0] }}"
- name: Running Neutron sfc bootstrap container
vars:
neutron_server: "{{ neutron_services['neutron-server'] }}"

43
ansible/roles/neutron/tasks/config.yml
View File

@ -59,7 +59,6 @@
- "neutron-openvswitch-agent"
- "neutron-openvswitch-agent-xenapi"
- "neutron-server"
- "neutron-lbaas-agent"
- "neutron-bgp-dragent"
- "neutron-infoblox-ipam-agent"
- "neutron-sriov-agent"
@ -81,29 +80,6 @@
notify:
- "Restart {{ item.key }} container"
- name: Copying over neutron_lbaas.conf
become: true
vars:
service_name: "{{ item.key }}"
services_need_neutron_lbaas_conf:
- "neutron-server"
- "neutron-lbaas-agent"
merge_configs:
sources:
- "{{ role_path }}/templates/neutron_lbaas.conf.j2"
- "{{ node_custom_config }}/neutron/neutron_lbaas.conf"
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron_lbaas.conf"
dest: "{{ node_config_directory }}/{{ item.key }}/neutron_lbaas.conf"
mode: "0660"
register: neutron_lbaas_confs
when:
- item.value.enabled | bool
- item.value.host_in_groups | bool
- item.key in services_need_neutron_lbaas_conf
with_dict: "{{ neutron_services }}"
notify:
- "Restart {{ item.key }} container"
- name: Copying over neutron_vpnaas.conf
become: true
vars:
@ -292,24 +268,6 @@
notify:
- "Restart {{ service_name }} container"
- name: Copying over lbaas_agent.ini
become: true
vars:
service_name: "neutron-lbaas-agent"
neutron_lbaas_agent: "{{ neutron_services[service_name] }}"
merge_configs:
sources:
- "{{ role_path }}/templates/lbaas_agent.ini.j2"
- "{{ node_custom_config }}/neutron/lbaas_agent.ini"
dest: "{{ node_config_directory }}/{{ service_name }}/lbaas_agent.ini"
mode: "0660"
register: neutron_lbaas_agent_ini
when:
- neutron_lbaas_agent.enabled | bool
- neutron_lbaas_agent.host_in_groups | bool
notify:
- "Restart {{ service_name }} container"
- name: Copying over metering_agent.ini
become: true
vars:
@ -401,7 +359,6 @@
- "neutron-openvswitch-agent"
- "neutron-openvswitch-agent-xenapi"
- "neutron-server"
- "neutron-lbaas-agent"
- "neutron-bgp-dragent"
- "neutron-sriov-agent"
template:

4
ansible/roles/neutron/tasks/rolling_upgrade.yml
View File

@ -30,10 +30,8 @@
- include_tasks: bootstrap_service.yml
vars:
neutron_lbaas_agent: "{{ neutron_services['neutron-lbaas-agent'] }}"
neutron_server: "{{ neutron_services['neutron-server'] }}"
when: (neutron_lbaas_agent.enabled | bool)
or (enable_neutron_sfc | bool and neutron_server.enabled | bool)
when: (enable_neutron_sfc | bool and neutron_server.enabled | bool)
- name: Flush Handlers
meta: flush_handlers

9
ansible/roles/neutron/tasks/upgrade.yml
View File

@ -1,4 +1,13 @@
---
# TODO(mgoddard): Remove this in U cycle once all old containers have been
# stopped.
- name: Stopping old neutron-lbaas-agent containers
become: true
kolla_docker:
action: "stop_and_remove_container"
common_options: "{{ docker_common_options }}"
name: "neutron_lbaas_agent"
- include_tasks: rolling_upgrade.yml
when: neutron_enable_rolling_upgrade | bool

6
ansible/roles/neutron/templates/lbaas_agent.ini.j2
View File

@ -1,6 +0,0 @@
[DEFAULT]
debug = {{ neutron_logging_debug }}
device_driver = neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver
[haproxy]
user_group = haproxy

42
ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
View File

@ -1,42 +0,0 @@
{
"command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini --config-file /etc/neutron/neutron_lbaas.conf",
"config_files": [
{
"source": "{{ container_config_directory }}/neutron.conf",
"dest": "/etc/neutron/neutron.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/lbaas_agent.ini",
"dest": "/etc/neutron/lbaas_agent.ini",
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/neutron_lbaas.conf",
"dest": "/etc/neutron/neutron_lbaas.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/policy.json",
"dest": "/etc/neutron/policy.json",
"owner": "neutron",
"perm": "0600",
"optional": true
}
],
"permissions": [
{
"path": "/var/log/kolla/neutron",
"owner": "neutron:neutron",
"recurse": true
},
{
"path": "/var/lib/neutron/kolla",
"owner": "neutron:neutron",
"recurse": true
}
]
}

8
ansible/roles/neutron/templates/neutron-server.json.j2
View File

@ -1,5 +1,5 @@
{
"command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'opendaylight'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/neutron_lbaas.conf --config-file /etc/neutron/neutron_vpnaas.conf {% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %} --config-file /etc/neutron/fwaas_driver.ini",
"command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'opendaylight'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/neutron_vpnaas.conf {% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %} --config-file /etc/neutron/fwaas_driver.ini",
"config_files": [
{
"source": "{{ container_config_directory }}/neutron.conf",
@ -13,12 +13,6 @@
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/neutron_lbaas.conf",
"dest": "/etc/neutron/neutron_lbaas.conf",
"owner": "neutron",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/neutron_vpnaas.conf",
"dest": "/etc/neutron/neutron_vpnaas.conf",

22
ansible/roles/neutron/templates/neutron_lbaas.conf.j2
View File

@ -1,22 +0,0 @@
{% if enable_neutron_lbaas | bool %}
[service_providers]
{% if enable_octavia | bool %}
service_provider = LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default
{% elif neutron_plugin_agent == 'vmware_nsxv' %}
service_provider = LOADBALANCERV2:VMWareEdge:neutron_lbaas.drivers.vmware.edge_driver_v2.EdgeLoadBalancerDriverV2:default
{% else %}
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
{% endif %}
[service_auth]
auth_url = {{ keystone_admin_url }}/v3
admin_tenant_name = service
admin_user = neutron
admin_password = {{ neutron_keystone_password }}
auth_version = 3
region = {{ openstack_region_name }}
endpoint_type = internal
project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }}
{% endif %}

1
ansible/site.yml
View File

@ -770,7 +770,6 @@
- neutron-server
- neutron-dhcp-agent
- neutron-l3-agent
- neutron-lbaas-agent
- ironic-neutron-agent
- neutron-metadata-agent
- neutron-metering-agent

3
doc/source/reference/compute/vmware-guide.rst
View File

@ -117,11 +117,10 @@ Enable VMware nova-compute plugin and NSX-V neutron-server plugin in
.. note::
VMware NSX-V also supports Neutron FWaaS, LBaaS and VPNaaS services, you can enable
VMware NSX-V also supports Neutron FWaaS and VPNaaS services, you can enable
them by setting these options in ``globals.yml``:
* enable_neutron_vpnaas: "yes"
* enable_neutron_lbaas: "yes"
* enable_neutron_fwaas: "yes"
If you want to set VMware datastore as cinder backend, enable it in

2
doc/source/reference/networking/index.rst
View File

@ -4,7 +4,7 @@ Networking
Kolla deploys Neutron by default as OpenStack networking component.
This section describes configuring and running Neutron extensions like
LBaaS, Networking-SFC, QoS, and so on.
Networking-SFC, QoS, and so on.
.. toctree::

2
etc/kolla/globals.yml
View File

@ -233,7 +233,6 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_horizon_manila: "{{ enable_manila | bool }}"
#enable_horizon_mistral: "{{ enable_mistral | bool }}"
#enable_horizon_murano: "{{ enable_murano | bool }}"
#enable_horizon_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}"
#enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}"
#enable_horizon_octavia: "{{ enable_octavia | bool }}"
#enable_horizon_qinling: "{{ enable_qinling | bool }}"
@ -267,7 +266,6 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_multipathd: "no"
#enable_neutron_bgp_dragent: "no"
#enable_neutron_dvr: "no"
#enable_neutron_lbaas: "no"
#enable_neutron_fwaas: "no"
#enable_neutron_qos: "no"
#enable_neutron_agent_ha: "no"

11
releasenotes/notes/retire-neutron-lbaas-3f893803a3fee29c.yaml Normal file
View File

@ -0,0 +1,11 @@
---
upgrade:
- |
The Neutron LBaaS project was retired. Upgrading to deployment to Train
release will not upgrade Neutron LBaaS. Learn more about its retirement and
Octavia as its successor at
https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
deprecations:
- |
The Neutron LBaaS project was retired and support for it in Kolla-Ansible
removed.

3
tests/templates/inventory.j2
View File

@ -291,9 +291,6 @@ neutron
[neutron-l3-agent:children]
neutron
[neutron-lbaas-agent:children]
neutron
[neutron-metadata-agent:children]
neutron