From baf9a10da0a7b7cf7047b4ba4905f69ace48803e Mon Sep 17 00:00:00 2001 From: Viktor Michalek Date: Fri, 20 Sep 2019 18:40:29 +0200 Subject: Neutron: fwaas should be installed also in Debian Change-Id: I3cbb64bc13bca6508dbc334fcec9214ca4c32185 --- docker/neutron/neutron-base/Dockerfile.j2 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 93bb05b69..68f8316d1 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -54,20 +54,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'neutron-server', 'openvswitch-switch', 'python3-networking-sfc', + 'python3-neutron-fwaas', 'python3-openvswitch', 'python3-oslo.vmware' ] %} + # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx + # 13.0.0 package now. add 'python-vmware-nsx' into + # neutron_base_packages list after UCA fixed the issue. - {% if base_distro == 'ubuntu' %} - - # FIXED(jeffrey4l): UCA rocky release is not include python-vmware-nsx - # 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 + [ - 'python3-neutron-fwaas', - ] %} - - {% endif %} {{ macros.debian_haproxy_existing_user_fix() }} {% endif %} -- cgit v1.2.3