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 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
parent
e1a16a4903
commit
beff4795a5
@ -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.
|
||||
@ -94,7 +99,7 @@ outputs:
|
||||
- []
|
||||
- {get_param: DockerInsecureRegistryAddress}
|
||||
container_registry_mirror: {get_param: DockerRegistryMirror}
|
||||
container_registry_network_options: '--bip=172.31.0.1/24'
|
||||
container_registry_network_options: {get_param: DockerNetworkOptions}
|
||||
block:
|
||||
- include_role:
|
||||
name: container-registry
|
||||
|
10
releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml
Normal file
10
releasenotes/notes/docker-bip-9a334c8f31a59b96.yaml
Normal file
@ -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…
x
Reference in New Issue
Block a user