Merge "Allow custom --bip CIDR for docker options" into stable/pike

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:

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``.