openstack
/
kolla
Code Issues Proposed changes

Merge "neutron-openvswitch-agent: openvswitch is already installed"

This commit is contained in:
Zuul 2021-11-02 12:33:53 +00:00 committed by Gerrit Code Review
parent c2874f18eb eff681063a
commit b8d1a62df6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -12,15 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set neutron_openvswitch_agent_packages = [ {% set neutron_openvswitch_agent_packages = [
'libibverbs', 'libibverbs',
'openstack-neutron-openvswitch', 'openstack-neutron-openvswitch'
'openvswitch'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set neutron_openvswitch_agent_packages = [ {% set neutron_openvswitch_agent_packages = [
'neutron-openvswitch-agent', 'neutron-openvswitch-agent'
'openvswitch-switch'
] %} ] %}
{% endif %} {% endif %}