From d3742fb9d819b6be3818842ba990bf4739d59051 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo 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/neutron/neutron-base/Dockerfile.j2 | 2 -- docker/neutron/neutron-server/extend_start.sh | 1 - 2 files changed, 3 deletions(-) (limited to 'docker/neutron') 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