diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-29 10:08:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-29 10:08:10 +0000 |
| commit | f1554fe7560abb3226967082b3ba2bb2264e9f90 (patch) | |
| tree | a459871ab11548f70c6f727b1de97e8a1ac01f83 /docker | |
| parent | 97d74c37b62223a9f61a9b0fdb5e316d18fb4fab (diff) | |
| parent | 9d821722f2779c0c747a2fa317f3eca3e60dc7cb (diff) | |
| download | kolla-f1554fe7560abb3226967082b3ba2bb2264e9f90.tar.gz kolla-f1554fe7560abb3226967082b3ba2bb2264e9f90.zip | |
Merge "add libibverbs package for openvswitch" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index c62dce2f6..924c1c32e 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -9,6 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set neutron_openvswitch_agent_packages = [ + 'libibverbs', 'openstack-neutron-openvswitch', 'openvswitch' ] %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 2d48f8468..86def9fb2 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -9,6 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set openvswitch_base_packages = [ + 'libibverbs', 'openvswitch', 'tcpdump' ] %} |
