diff options
| author | Zuul <zuul@review.opendev.org> | 2025-03-28 20:23:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-03-28 20:23:14 +0000 |
| commit | 78c5638f37683aecc404e96e32f3f0abb618d1bb (patch) | |
| tree | e22a735d46b1e49b5d3003a3a775acdaa03de3f7 /docker/neutron | |
| parent | ec782ff297cb6c813f95db70d3d8eed64e78710b (diff) | |
| parent | 6da05fc6d59cb0015f557e291aaa6fe4e836e55b (diff) | |
| download | kolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.tar.gz kolla-78c5638f37683aecc404e96e32f3f0abb618d1bb.zip | |
Merge "neutron: Add docker clients for ML2/OVS improvement"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 40015e495..ba8c3684d 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['openvswitch']) }} +{{ macros.enable_extra_repos(['docker-ce', 'openvswitch']) }} {{ macros.configure_user(name='neutron') }} {% if base_package_type == 'rpm' %} @@ -16,6 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'conntrack-tools', 'dnsmasq', 'dnsmasq-utils', + 'docker-ce-cli', 'haproxy', 'iproute-tc', 'ipset', @@ -35,6 +36,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'conntrack', 'dnsmasq', 'dnsmasq-utils', + 'docker-ce-cli', 'haproxy', 'iproute2', 'ipset', |