Merge "Configure docker0 bridge address" into stable/pike

diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index 2cda08e..2d8d336 100644 (file)
--- 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 (file)
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.