Merge "Allow to increase docker daemon verbosity"

This commit is contained in:
Zuul 2017-12-26 15:55:56 +00:00 committed by Gerrit Code Review
commit e6db8c4ad0

@ -50,6 +50,10 @@ parameters:
type: string type: string
constraints: constraints:
- allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE'] - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
DockerOptions:
default: '--log-driver=journald --signature-verification=false --iptables=false'
description: Options that are used to startup the docker service.
type: string
conditions: conditions:
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]} insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
@ -65,6 +69,7 @@ outputs:
map_merge: map_merge:
- tripleo::profile::base::docker::configure_network: true - tripleo::profile::base::docker::configure_network: true
tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24" tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24"
tripleo::profile::base::docker::docker_options: {get_param: DockerOptions}
tripleo::profile::base::docker::debug: tripleo::profile::base::docker::debug:
if: if:
- service_debug_unset - service_debug_unset