diff options
| author | Carlos Goncalves <cgoncalves@redhat.com> | 2019-06-04 14:25:32 +0200 |
|---|---|---|
| committer | Carlos Goncalves <cgoncalves@redhat.com> | 2019-06-07 09:56:44 +0000 |
| commit | 43ecacaffb673fbe66b2f99199c2c61142586306 (patch) | |
| tree | 3b200bdf37c4ad1293b1a7cdf3f19d1f513b2c4b /docker/horizon | |
| parent | 4e083196d14877de458ae16129331c37fe1f6f21 (diff) | |
| download | kolla-43ecacaffb673fbe66b2f99199c2c61142586306.tar.gz kolla-43ecacaffb673fbe66b2f99199c2c61142586306.zip | |
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
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 7 |
2 files changed, 1 insertions, 9 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 |
