From 9c8f74993d63d73dfead6d1edb2b2827ae0e71bf Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 3 Jun 2021 15:19:29 +0100
Subject: [PATCH] Fix container image builds

Container image builds broken due to disabling docker iptables
management in
https://review.opendev.org/c/openstack/kolla-ansible/+/751795. This
affects Wallaby and later.

This patch configures kolla-build to use network_mode=host.

Change-Id: I608c0362e6eeea65ffafb32cda5c19ccb6ec8b5c
Story: 2008942
Task: 42560
---
 ansible/roles/kolla-build/templates/kolla-build.conf.j2     | 4 ++++
 .../notes/kolla-build-network-mode-ba92e36d52e70d99.yaml    | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 releasenotes/notes/kolla-build-network-mode-ba92e36d52e70d99.yaml

diff --git a/ansible/roles/kolla-build/templates/kolla-build.conf.j2 b/ansible/roles/kolla-build/templates/kolla-build.conf.j2
index 18a79be3c..5603bf787 100644
--- a/ansible/roles/kolla-build/templates/kolla-build.conf.j2
+++ b/ansible/roles/kolla-build/templates/kolla-build.conf.j2
@@ -11,6 +11,10 @@ install_type={{ kolla_install_type }}
 # Docker namespace to use for Kolla images.
 namespace={{ kolla_docker_namespace }}
 
+# Use host networking by default, in line with Kolla Ansible's default Docker
+# engine configuration.
+network_mode=host
+
 # Docker image tag to apply.
 tag={{ kolla_tag }}
 
diff --git a/releasenotes/notes/kolla-build-network-mode-ba92e36d52e70d99.yaml b/releasenotes/notes/kolla-build-network-mode-ba92e36d52e70d99.yaml
new file mode 100644
index 000000000..4a55b8d36
--- /dev/null
+++ b/releasenotes/notes/kolla-build-network-mode-ba92e36d52e70d99.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with container image builds by using ``host`` as the default
+    ``network_mode`` for ``kolla-build``. See `story 2008942
+    <https://storyboard.openstack.org/#!/story/2008942>`__ for details.