From 47ff0843d1579fffc94c760b29323541acefbccd Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Thu, 26 Mar 2020 11:44:52 +0100 Subject: [PATCH] Remove unused hiera parameters This patch removes creating unused hiera parameters for QDR external endpoint and makes sure it is possible to disable listening on bus externally. Relevant puppet-tripleo patch: I6ae1ceca7ed4ae313c10e6d8be9803d20d68957d Change-Id: I4fa5be9e779da4980946497f8699663816325276 --- deployment/metrics/qdr-container-puppet.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 6a7c6b95d1..0d92ad5ba6 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -128,7 +128,9 @@ parameters: type: string MetricsQdrExternalEndpoint: default: false - description: Whether QDR should listen on external network interface. + description: | + Whether QDR should listen on external network interface. To enable listening + on external network one must deploy QDRs in mesh mode. type: boolean InternalTLSCAFile: default: '/etc/ipa/ca.crt' @@ -179,10 +181,7 @@ outputs: - {get_param: MetricsQdrLoggingSource} config_settings: map_merge: - - - tripleo::profile::base::metrics::qdr::external_listener_addr: - get_param: [EndpointMap, MetricsQdrPublic, host] - tripleo::profile::base::metrics::qdr::listener_addr: + - tripleo::profile::base::metrics::qdr::listener_addr: str_replace: template: "%{hiera('$NETWORK')}" @@ -194,7 +193,7 @@ outputs: template: "ROLENAMEMetricsQdrNetwork" params: ROLENAME: {get_param: RoleName} - tripleo::profile::base::metrics::qdr::listen_on_external: {get_param: MetricsQdrExternalEndpoint} + tripleo::haproxy::metrics_qdr: {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}