diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-03-17 07:28:19 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-03-26 06:16:00 +0000 |
| commit | 6da05fc6d59cb0015f557e291aaa6fe4e836e55b (patch) | |
| tree | 80b56aa560bab502e1e32731da777e949c76ee26 /docker | |
| parent | a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547 (diff) | |
| download | kolla-6da05fc6d59cb0015f557e291aaa6fe4e836e55b.tar.gz kolla-6da05fc6d59cb0015f557e291aaa6fe4e836e55b.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/docker-ce.repo | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c680f458c..426ec0eaa 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -54,6 +54,7 @@ COPY dnf.conf /etc/dnf/dnf.conf #### BEGIN REPO ENABLEMENT {% set base_yum_repo_files = [ + 'docker-ce.repo', 'grafana.repo', 'influxdb.repo', 'mariadb.repo', @@ -302,6 +303,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} {% set base_remote_apt_keys = [ + {'name': 'docker-ce', 'url': 'https://download.docker.com/linux/debian/gpg'}, {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'}, {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'}, {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'}, diff --git a/docker/base/docker-ce.repo b/docker/base/docker-ce.repo new file mode 100644 index 000000000..d976c5852 --- /dev/null +++ b/docker/base/docker-ce.repo @@ -0,0 +1,6 @@ +[docker-ce] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/centos/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg 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', |