openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Don't use defined"

This commit is contained in:
Zuul 2020-02-04 21:11:06 +00:00 committed by Gerrit Code Review
parent 0d41163d95 53665f2393
commit 7a87b0add7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/logging/rsyslog.pp
View File

@ -58,7 +58,7 @@ class tripleo::profile::base::logging::rsyslog (
# other choice than using hiera currently.
$rsyslog_confdir = hiera('rsyslog::confdir', '/etc/rsyslog.d')
if defined('$elasticsearch_tls_ca_cert') {
if $elasticsearch_tls_ca_cert {
$cacert_path = "${rsyslog_confdir}/es-ca-cert.crt"
$cacert_conf = {'tls.cacert' => $cacert_path}
@ -72,7 +72,7 @@ class tripleo::profile::base::logging::rsyslog (
$esconf1 = $elasticsearch
}
if defined('$elasticsearch_tls_client_cert') {
if $elasticsearch_tls_client_cert {
$clientcert_path = "${rsyslog_confdir}/es-client-cert.pem"
$clientcert_conf = {'tls.mycert' => $clientcert_path}
@ -86,7 +86,7 @@ class tripleo::profile::base::logging::rsyslog (
$esconf2 = $esconf1
}
if defined('$elasticsearch_tls_client_key') {
if $elasticsearch_tls_client_key {
$clientkey_path = "${rsyslog_confdir}/es-client-key.pem"
$clientkey_conf = {'tls.myprivkey' => $clientkey_path}