From 00f09d98dad7bf65838144f3299d1ea4449d8e8b Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 19 Mar 2021 08:42:28 -0600
Subject: [PATCH] [TRAIN-Only] Specify default podman network

In a01366b8a932881eb02954f90870cc4dea1abb1a we didn't define the network
by default because we were still using podman 1.6.x. Now that podman 3
is coming, we have to define a valid network configuration or it throws
an error for every cli invocation.

Change-Id: I9954be4c6ec4cffc83c9f19e9ddb0fc195d2ec88
Related-Bug: #1898120
---
 .../roles/tripleo-podman/defaults/main.yml    | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/tripleo_ansible/roles/tripleo-podman/defaults/main.yml b/tripleo_ansible/roles/tripleo-podman/defaults/main.yml
index 492f275c7..90423ef61 100644
--- a/tripleo_ansible/roles/tripleo-podman/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo-podman/defaults/main.yml
@@ -27,4 +27,27 @@ tripleo_podman_purge_packages: "{{ _tripleo_podman_purge_packages | default([])
 tripleo_podman_tls_verify: true
 tripleo_podman_debug: false
 tripleo_podman_buildah_login: false
-tripleo_podman_default_network_config: {}
+# this is the default network configuration except the range has been moved
+# from 10.88.0.0/16 to 10.255.255.0/24 to try and prevent a conflict in an
+# existing cloud
+tripleo_podman_default_network_config:
+  cniVersion: 0.4.0
+  name: podman
+  plugins:
+    - type: bridge
+      bridge: cni-podman0
+      isGateway: true
+      ipMasq: true
+      hairpinMode: true
+      ipam:
+        type: host-local
+        routes:
+          - dst: 0.0.0.0/0
+        ranges:
+          - - subnet: 10.255.255.0/24
+              gateway: 10.255.255.1
+    - type: portmap
+      capabilities:
+        portMappings: true
+    - type: firewall
+    - type: tuning