From d3742fb9d819b6be3818842ba990bf4739d59051 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Thu, 18 Jun 2020 16:03:55 +0200
Subject: Remove deployment of FWaaS

FWaaS is being retired upstream [1][2] in V cycle.

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

Change-Id: I45679c8596844780565644e52034bd3de0915ff4
---
 docker/horizon/Dockerfile.j2                  | 1 -
 docker/horizon/extend_start.sh                | 9 ---------
 docker/neutron/neutron-base/Dockerfile.j2     | 2 --
 docker/neutron/neutron-server/extend_start.sh | 1 -
 4 files changed, 13 deletions(-)

(limited to 'docker')

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index ec3a5e233..20eae334b 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 3033fcd4f..7dc055714 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -96,14 +96,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}" \
@@ -340,7 +332,6 @@ config_blazar_dashboard
 config_cloudkitty_dashboard
 config_congress_dashboard
 config_designate_dashboard
-config_fwaas_dashboard
 config_freezer_ui
 config_heat_dashboard
 config_ironic_dashboard
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 81ba036c0..4b8cef81b 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -18,7 +18,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'net-tools',
             'radvd',
             'openstack-neutron',
-            'openstack-neutron-fwaas',
             'openstack-neutron-ml2',
             'openvswitch',
             'python3-networking-baremetal',
@@ -42,7 +41,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openvswitch-switch',
             'python3-networking-mlnx',
             'python3-networking-sfc',
-            'python3-neutron-fwaas',
             'python3-openvswitch',
             'python3-oslo.vmware'
         ] %}
diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh
index 1a018a1b0..3e15043eb 100644
--- a/docker/neutron/neutron-server/extend_start.sh
+++ b/docker/neutron/neutron-server/extend_start.sh
@@ -6,7 +6,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     OPTS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
     neutron-db-manage ${OPTS} --subproject neutron upgrade head
     neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head
-    neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head
     neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head
     exit 0
 fi
-- 
cgit v1.2.3