diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-02 12:33:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-02 12:33:53 +0000 |
| commit | b8d1a62df61382b6a5d5585c9e2d5efe5c929154 (patch) | |
| tree | 3f2b44b8ee9b9469c9cfc19e4f12c98f0cd410e1 | |
| parent | c2874f18ebd092bd349c7f9888727287b352a035 (diff) | |
| parent | eff681063adc62faef55cde0ffa6df8de1a04055 (diff) | |
| download | kolla-b8d1a62df61382b6a5d5585c9e2d5efe5c929154.tar.gz kolla-b8d1a62df61382b6a5d5585c9e2d5efe5c929154.zip | |
Merge "neutron-openvswitch-agent: openvswitch is already installed"
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 8d3162e06..e35478a7a 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 %} |