From 262310042dd5a64986c10674aa8e7c990f92a77b Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 24 Oct 2017 11:36:06 +0200 Subject: 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) --- puppet/services/docker.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'puppet') 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: -- cgit 1.2.3-korg