aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/docker.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services/docker.yaml')
-rw-r--r--puppet/services/docker.yaml12
1 files changed, 8 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: