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/ Depends-On: https://review.opendev.org/#/c/663875/ Change-Id: I99484c48ed09f7e015e134bdff1f298c359c6905
This commit is contained in:
Carlos Goncalves
parent
4e083196d1
commit
43ecacaffb
|
|
@ -27,7 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
'openstack-manila-ui',
|
||||
'openstack-mistral-ui',
|
||||
'openstack-murano-ui',
|
||||
'openstack-neutron-lbaas-ui',
|
||||
'openstack-octavia-ui',
|
||||
'openstack-sahara-ui',
|
||||
'openstack-trove-ui',
|
||||
|
|
@ -71,7 +70,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
|||
'python3-trove-dashboard',
|
||||
'tzdata'
|
||||
] %}
|
||||
#NOTE(hrw): check for python-murano-dashboard python-neutron-lbaas-dashboard
|
||||
#NOTE(hrw): check for python-murano-dashboard
|
||||
|
||||
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
|
||||
|
||||
|
|
|
|||
|
|
@ -174,12 +174,6 @@ function config_mistral_dashboard {
|
|||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_mistral.py"
|
||||
}
|
||||
|
||||
function config_neutron_lbaas {
|
||||
config_dashboard "${ENABLE_NEUTRON_LBAAS}" \
|
||||
"${SITE_PACKAGES}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py" \
|
||||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
|
||||
}
|
||||
|
||||
function config_neutron_vpnaas_dashboard {
|
||||
config_dashboard "${ENABLE_NEUTRON_VPNAAS}" \
|
||||
"${SITE_PACKAGES}/neutron_vpnaas_dashboard/enabled/_7100_project_vpn_panel.py" \
|
||||
|
|
@ -329,7 +323,6 @@ config_magnum_dashboard
|
|||
config_manila_ui
|
||||
config_mistral_dashboard
|
||||
config_murano_dashboard
|
||||
config_neutron_lbaas
|
||||
config_neutron_vpnaas_dashboard
|
||||
config_octavia_dashboard
|
||||
config_qinling_dashboard
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
'radvd',
|
||||
'openstack-neutron',
|
||||
'openstack-neutron-fwaas',
|
||||
'openstack-neutron-lbaas',
|
||||
'openstack-neutron-ml2',
|
||||
'openvswitch'
|
||||
] %}
|
||||
|
|
@ -65,7 +64,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
# 13.0.0 package now. add 'python-vmware-nsx' into
|
||||
# neutron_base_packages list after UCA fixed the issue.
|
||||
{% set neutron_base_packages = neutron_base_packages + [
|
||||
'neutron-lbaas-common',
|
||||
'python3-neutron-fwaas',
|
||||
] %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
|
||||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
||||
|
||||
{% block neutron_lbaas_agent_header %}{% endblock %}
|
||||
|
||||
{% import "macros.j2" as macros with context %}
|
||||
|
||||
{% set neutron_lbaas_agent_packages = [
|
||||
'haproxy'
|
||||
] %}
|
||||
{{ macros.install_packages(neutron_lbaas_agent_packages | customizable("packages")) }}
|
||||
|
||||
{% if install_type == 'binary' %}
|
||||
{% if base_package_type == 'rpm' %}
|
||||
|
||||
{% set neutron_lbaas_agent_packages = [
|
||||
'openstack-neutron-lbaas'
|
||||
] %}
|
||||
|
||||
{% elif base_package_type == 'deb' %}
|
||||
|
||||
{% set neutron_lbaas_agent_packages = [
|
||||
'neutron-lbaas-common',
|
||||
'neutron-lbaasv2-agent',
|
||||
'python3-neutron-lbaas'
|
||||
] %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{{ macros.install_packages(neutron_lbaas_agent_packages | customizable("packages")) }}
|
||||
|
||||
{% elif install_type == 'source' %}
|
||||
|
||||
ADD neutron-lbaas-agent-archive /neutron-lbaas-agent-source
|
||||
|
||||
{% set neutron_lbaas_agent_pip_packages = [
|
||||
'/neutron_lbaas'
|
||||
] %}
|
||||
|
||||
RUN ln -s neutron-lbaas-agent-source/* neutron_lbaas \
|
||||
&& {{ macros.install_pip(neutron_lbaas_agent_pip_packages | customizable("pip_packages")) }} \
|
||||
&& cp /neutron_lbaas/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d \
|
||||
&& sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf
|
||||
|
||||
{% endif %}
|
||||
|
||||
COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
|
||||
RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
|
||||
|
||||
{% block neutron_lbaas_agent_footer %}{% endblock %}
|
||||
{% block footer %}{% endblock %}
|
||||
|
||||
USER neutron
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
|
||||
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
||||
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
||||
neutron-db-manage --subproject neutron-lbaas --config-file /etc/neutron/neutron.conf upgrade head
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -24,9 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
{% elif base_package_type == 'deb' %}
|
||||
|
||||
{% set neutron_server_packages = [
|
||||
'neutron-lbaasv2-agent',
|
||||
'python3-neutron-dynamic-routing',
|
||||
'python3-neutron-lbaas',
|
||||
'python3-neutron-vpnaas'
|
||||
] %}
|
||||
|
||||
|
|
|
|||
|
|
@ -439,10 +439,6 @@ SOURCES = {
|
|||
'type': 'url',
|
||||
'location': ('$tarballs_base/murano-dashboard/'
|
||||
'murano-dashboard-master.tar.gz')},
|
||||
'horizon-plugin-neutron-lbaas-dashboard': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-lbaas-dashboard/'
|
||||
'neutron-lbaas-dashboard-master.tar.gz')},
|
||||
'horizon-plugin-neutron-vpnaas-dashboard': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-vpnaas-dashboard/'
|
||||
|
|
@ -608,10 +604,6 @@ SOURCES = {
|
|||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-dynamic-routing/'
|
||||
'neutron-dynamic-routing-master.tar.gz')},
|
||||
'neutron-lbaas-agent': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-lbaas/'
|
||||
'neutron-lbaas-master.tar.gz')},
|
||||
'neutron-server-opendaylight-plugin-networking-odl': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/networking-odl/'
|
||||
|
|
@ -636,10 +628,6 @@ SOURCES = {
|
|||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-dynamic-routing/'
|
||||
'neutron-dynamic-routing-master.tar.gz')},
|
||||
'neutron-server-plugin-neutron-lbaas': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/neutron-lbaas/'
|
||||
'neutron-lbaas-master.tar.gz')},
|
||||
'neutron-server-plugin-vmware-nsxlib': {
|
||||
'type': 'url',
|
||||
'location': ('$tarballs_base/vmware-nsxlib/'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
---
|
||||
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 removed.
|
||||
Loading…
Reference in New Issue