From 25cc6898113ec0ebb8ddb187fa9508eb64285683 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Tue, 26 Jun 2018 12:02:14 +0300
Subject: [PATCH] Allow custom --bip CIDR for docker options

The default docker0 brige should be normally given a
value that does not conflict to any of the existing
networks' CIDR ranges.

If there is a conflict for the default value `172.31.0.1/24`,
allow users to alter the the docker service startup ``--bip``
option via ``DockerNetworkOptions``.

Change-Id: I9b3e729ba48811415106c9fa460cd5a677067fb7
Closes-Bug: #1783271
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 06c66972259482819e5e0705104ebc7d9a14e8ff)
---
 puppet/services/docker.yaml                         |  7 ++++++-
 releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml

diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index 02254ca0fd..3f2b235cf3 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -40,6 +40,11 @@ parameters:
     default: '--log-driver=journald --signature-verification=false --iptables=false --live-restore'
     description: Options that are used to startup the docker service.
     type: string
+  DockerNetworkOptions:
+    default: '--bip=172.31.0.1/24'
+    description: More startup options, like CIDR for the default docker0 bridge (useful for the
+                 network configuration conflicts resolution)
+    type: string
 
 conditions:
   insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
@@ -52,7 +57,7 @@ outputs:
       config_settings:
         map_merge:
           - tripleo::profile::base::docker::configure_network: true
-            tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24"
+            tripleo::profile::base::docker::network_options:  {get_param: DockerNetworkOptions}
             tripleo::profile::base::docker::docker_options: {get_param: DockerOptions}
           -
             if:
diff --git a/releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml b/releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml
new file mode 100644
index 0000000000..b5eb34f618
--- /dev/null
+++ b/releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml
@@ -0,0 +1,10 @@
+---
+other:
+  - |
+    The default docker0 brige should be normally given a
+    value that does not conflict to any of the existing
+    networks' CIDR ranges.
+
+    If there is a conflict for the default value `172.31.0.1/24`,
+    allow users to alter the the docker service startup ``--bip``
+    option via ``DockerNetworkOptions``.