From 6da05fc6d59cb0015f557e291aaa6fe4e836e55b Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Sun, 17 Mar 2024 07:28:19 +0100 Subject: neutron: Add docker clients for ML2/OVS improvement Docker does not support running a container in a given network namespace (netns) so we need a client installed in the Neutron container images. Related-Bug: #1891469 Change-Id: I5349449183dbb7f4ec2042a21526076fb42591b3 --- docker/neutron/neutron-base/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/neutron') diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 3d0b74869..6e3eb2ed5 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', -- cgit v1.2.3