From eff681063adc62faef55cde0ffa6df8de1a04055 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Nov 2021 15:15:18 +0100 Subject: [PATCH] neutron-openvswitch-agent: openvswitch is already installed We install openvswitch package in neutron-base image already so there is no need of repeating it. Change-Id: Id578cbc49c9a432414e5c758e0c853e59f79b039 --- docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 8d3162e06c..e35478a7af 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -12,15 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set neutron_openvswitch_agent_packages = [ 'libibverbs', - 'openstack-neutron-openvswitch', - 'openvswitch' + 'openstack-neutron-openvswitch' ] %} {% elif base_package_type == 'deb' %} {% set neutron_openvswitch_agent_packages = [ - 'neutron-openvswitch-agent', - 'openvswitch-switch' + 'neutron-openvswitch-agent' ] %} {% endif %}