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 beff4795a5
)
This commit is contained in:
parent
b579397eab
commit
d30350498d
|
@ -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:
|
||||
|
|
|
@ -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``.
|
Loading…
Reference in New Issue