From 6da05fc6d59cb0015f557e291aaa6fe4e836e55b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
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/base/Dockerfile.j2  | 2 ++
 docker/base/docker-ce.repo | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 docker/base/docker-ce.repo

(limited to 'docker/base')

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
-- 
cgit v1.2.3