From 553ede19454e470312f12a2bc85f0b67e7128273 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Thu, 14 Nov 2019 15:23:55 +0100 Subject: [PATCH] Use public network for external interface This patch adds possibility for metrics' QDR to listen on public network for external connections (from CloudForms for example). Change-Id: I252688c579e76acb8f5fc1fc30fb4f336f905dca --- deployment/metrics/qdr-container-puppet.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index a3bfe9617d..9c00d958fa 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -126,6 +126,10 @@ parameters: default: 'no' description: Authenticate the client using SSL/TLS type: string + MetricsQdrExternalEndpoint: + default: false + description: Whether QDR should listen on external network interface. + type: boolean InternalTLSCAFile: default: '/etc/ipa/ca.crt' type: string @@ -160,12 +164,19 @@ outputs: - {get_param: MetricsQdrLoggingSource} config_settings: map_merge: - - tripleo::profile::base::metrics::qdr::listener_addr: + - tripleo::profile::base::metrics::qdr::external_listener_addr: + str_replace: + template: + "%{hiera('$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, PublicNetwork]} + tripleo::profile::base::metrics::qdr::listener_addr: str_replace: template: "%{hiera('$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]} + tripleo::profile::base::metrics::qdr::listen_on_external: {get_param: MetricsQdrExternalEndpoint} tripleo::profile::base::metrics::qdr::listener_port: {get_param: MetricsQdrPort} tripleo::profile::base::metrics::qdr::username: {get_param: MetricsQdrUsername} tripleo::profile::base::metrics::qdr::password: {get_param: MetricsQdrPassword}