From d30350498dcb651fd666e06b2d7c58c82f39ef6b Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya 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 (cherry picked from commit beff4795a59dd5fc9b52cc020df9bca49af87528) --- 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 e338913022..242e7fa60b 100644 --- a/puppet/services/docker.yaml +++ b/puppet/services/docker.yaml @@ -59,6 +59,11 @@ parameters: description: Additional domain sockets for the docker daemon to bind to (useful for mounting into containers that launch other containers) type: comma_delimited_list + 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 DeploymentUser: default: '' description: User added to the docker group in order to use container commands. @@ -79,7 +84,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} tripleo::profile::base::docker::debug: 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``.