aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j23
-rw-r--r--docker/horizon/extend_start.sh7
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j22
-rw-r--r--docker/neutron/neutron-lbaas-agent/Dockerfile.j253
-rw-r--r--docker/neutron/neutron-lbaas-agent/extend_start.sh8
-rw-r--r--docker/neutron/neutron-server/Dockerfile.j22
6 files changed, 1 insertions, 74 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index cda759521..1abc2fd53 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -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")) }}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 19681affb..525b9aeeb 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -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
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index fb5af658f..1aaacaea9 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -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',
] %}
diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
deleted file mode 100644
index 5e8f135c7..000000000
--- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/docker/neutron/neutron-lbaas-agent/extend_start.sh b/docker/neutron/neutron-lbaas-agent/extend_start.sh
deleted file mode 100644
index 117fa0485..000000000
--- a/docker/neutron/neutron-lbaas-agent/extend_start.sh
+++ /dev/null
@@ -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
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 6404a79d9..8a27a98b5 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -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'
] %}
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 20:07:56 +0000