From cfa77a6936160dec48d60c1165fdf0f41bcf4023 Mon Sep 17 00:00:00 2001 From: Aleksandr Didenko Date: Mon, 21 Sep 2015 11:32:44 -0500 Subject: [PATCH] Change remote logging configuration condition We'll have new 'enabled' meta parameter in 'syslog' hash. So it would be better to use it in remote logging conditions. Requires: I0190c202a72f432c23c71b9ebea88bc01476d2ee Change-Id: Id4b8cd47bd27bbc7224a3258b5b5388b89496e35 Partial-bug: #1418848 --- deployment/puppet/osnailyfacter/modular/logging/logging.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deployment/puppet/osnailyfacter/modular/logging/logging.pp b/deployment/puppet/osnailyfacter/modular/logging/logging.pp index 19cfa29a5c..412bdbcac5 100644 --- a/deployment/puppet/osnailyfacter/modular/logging/logging.pp +++ b/deployment/puppet/osnailyfacter/modular/logging/logging.pp @@ -19,9 +19,7 @@ $syslog_rserver = { 'port' => $syslog_hash['syslog_port'], } -if ($syslog_hash['syslog_server'] != '' - and $syslog_hash['syslog_port'] != '' - and $syslog_hash['syslog_transport'] != '') { +if $syslog_hash['metadata']['enabled'] { $rservers = [$base_syslog_rserver, $syslog_rserver] } else { $rservers = [$base_syslog_rserver]