Merge "Configure docker0 bridge address"
This commit is contained in:
commit
1187d1cafe
|
@ -46,10 +46,14 @@ outputs:
|
|||
value:
|
||||
service_name: docker
|
||||
config_settings:
|
||||
if:
|
||||
- insecure_registry_is_empty
|
||||
- {}
|
||||
- tripleo::profile::base::docker::insecure_registries: {get_param: DockerInsecureRegistryAddress}
|
||||
map_merge:
|
||||
- tripleo::profile::base::docker::configure_network: true
|
||||
tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24"
|
||||
-
|
||||
if:
|
||||
- insecure_registry_is_empty
|
||||
- {}
|
||||
- tripleo::profile::base::docker::insecure_registries: {get_param: DockerInsecureRegistryAddress}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::docker
|
||||
upgrade_tasks:
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Changed default address of docker0 bridge to be in the last class B private
|
||||
network -- 172.31.0.1/24 -- to stop conflicting with the default network
|
||||
range for InternalApiNetCidr. The docker0 bridge is normally unused in
|
||||
TripleO deployment.
|
Loading…
Reference in New Issue