From 07bc933d0d2a17f99db3d70ef258d8ea17720e28 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 1 Nov 2017 14:34:48 -0400 Subject: [PATCH] Add DockerDebug Implement a mechanism to enable docker service debug logging. If DockerDebug is unset defaults to the normal Debug parameter setting. Change-Id: I4f4627c7d8e90121c1262b2518b02989f5aaed18 --- puppet/services/docker.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml index 119cf11972..6bb26c116b 100644 --- a/puppet/services/docker.yaml +++ b/puppet/services/docker.yaml @@ -40,10 +40,21 @@ parameters: default: {} description: Parameters specific to the role type: json + Debug: + type: boolean + default: false + description: Set to True to enable debugging on all services. + DockerDebug: + default: '' + description: Set to True to enable debugging Docker services. + type: string + constraints: + - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE'] conditions: insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]} insecure_registry_mirror_is_empty: {equals : [{get_param: DockerRegistryMirror}, '']} + service_debug_unset: {equals : [{get_param: DockerDebug}, '']} outputs: role_data: @@ -54,6 +65,11 @@ outputs: map_merge: - tripleo::profile::base::docker::configure_network: true tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24" + tripleo::profile::base::docker::debug: + if: + - service_debug_unset + - {get_param: Debug } + - {get_param: DockerDebug} - if: - insecure_registry_is_empty