summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-10 12:26:53 +0000
committerGerrit Code Review <review@openstack.org>2017-11-10 12:26:53 +0000
commit090650470f015d1dd648132e47bd5e1008373962 (patch)
treebdb91d8c0863308a7ff75d59feba8e6be96309d0
parent18d63efe385027b25809cc1c83625b82fd8d153d (diff)
parent262310042dd5a64986c10674aa8e7c990f92a77b (diff)
Merge "Configure docker0 bridge address" into stable/pike
-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 2cda08eb..2d8d3363 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 00000000..792bb7f1
--- /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.