aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-10-24 11:36:06 +0200
committerMartin André <m.andre@redhat.com>2017-11-10 07:30:31 +0000
commit262310042dd5a64986c10674aa8e7c990f92a77b (patch)
treef0d2bb99d5c5d8f673ef99e97eb55c3e979b030b
parent690b938c58af1446bd27c34b17fa45e865241e99 (diff)
Configure docker0 bridge address
This was previously conflicting with the InternalApiNetCidr value in environments/network-environment.yaml. Change-Id: I3f1cb6f056fb19a1ba93d1076191abe7aca4fa21 Depends-On: Ie803b33c93b931f7fefb87b6833eb22fd59cd92d Closes-Bug: #1726773 (cherry picked from commit 509209a29be1ac3e72d6ea97eaf328760693daaf)
-rw-r--r--puppet/services/docker.yaml12
-rw-r--r--releasenotes/notes/change_default_docker0_address-6a017b7078825996.yaml7
2 files changed, 15 insertions, 4 deletions
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index 2cda08e..2d8d336 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -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:
diff --git a/releasenotes/notes/change_default_docker0_address-6a017b7078825996.yaml b/releasenotes/notes/change_default_docker0_address-6a017b7078825996.yaml
new file mode 100644
index 0000000..792bb7f
--- /dev/null
+++ b/releasenotes/notes/change_default_docker0_address-6a017b7078825996.yaml
@@ -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.