diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-30 08:50:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-30 08:50:43 +0000 |
| commit | 12905b5fc18c93fdece91df9a2446771d10dfbad (patch) | |
| tree | ee48d2eeef8023050c411e96e3bb086da3a2326b /docker/horizon | |
| parent | 5b4e00decc28512136cdeb27404b2febb62d8dc7 (diff) | |
| parent | d3742fb9d819b6be3818842ba990bf4739d59051 (diff) | |
| download | kolla-12905b5fc18c93fdece91df9a2446771d10dfbad.tar.gz kolla-12905b5fc18c93fdece91df9a2446771d10dfbad.zip | |
Merge "Remove deployment of FWaaS"
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index db28421ca..3a79a7ca0 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -66,7 +66,6 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ ] %} {% if base_distro == 'debian' %} {% set horizon_packages = horizon_packages + [ - 'python3-neutron-fwaas-dashboard', 'python3-neutron-vpnaas-dashboard', 'python3-vitrage-dashboard', ] %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 94998cb36..e1f607ac6 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -88,14 +88,6 @@ function config_designate_dashboard { done } -function config_fwaas_dashboard { - for file in ${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/_*[^__].py; do - config_dashboard "${ENABLE_FWAAS}" \ - "${SITE_PACKAGES}/neutron_fwaas_dashboard/enabled/${file##*/}" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" - done -} - function config_freezer_ui { for file in ${SITE_PACKAGES}/disaster_recovery/enabled/_*[^__].py; do config_dashboard "${ENABLE_FREEZER}" \ @@ -331,7 +323,6 @@ function settings_changed { config_blazar_dashboard config_cloudkitty_dashboard config_designate_dashboard -config_fwaas_dashboard config_freezer_ui config_heat_dashboard config_ironic_dashboard |