From e255c1e7b9198f7eb27cb60e28760a77f9a25020 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Date: Wed, 18 Mar 2015 13:43:35 +0100 Subject: [PATCH] Switch empty string to undef Empty strings were still making that the conditions of templates were considered true. --- manifests/init.pp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2edb9e9..a389fde 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,15 +17,15 @@ class puppet ( $pin_puppet = '3.', $enable_puppet = false, - $http_proxy = '', - $agent_http_proxy_host = '', - $agent_http_proxy_port = '', - $https_proxy = '', + $http_proxy = undef, + $agent_http_proxy_host = undef, + $agent_http_proxy_port = undef, + $https_proxy = undef, $certname = $::fqdn, $puppetmaster_server = 'puppetmaster.openstack.org', - $puppet_ca_server = '', - $ca_server = '', - $dns_alt_names = '', + $puppet_ca_server = undef, + $ca_server = undef, + $dns_alt_names = undef, $environment_path = '/etc/puppet/environments', $basemodule_path = '/etc/puppet/modules', $environment_timeout = 0,