Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394367 )
Change subject: puppet: update hiera function call in puppet_ssldir
......................................................................
puppet: update hiera function call in puppet_ssldir
function_hiera breaks under puppet 4. update to call_function.
Bug: T179181
Change-Id: I3ccf51035ea5fe2d538b7da967c1b19c4bcfcc04
---
M modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
b/modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
index 8bcdd87..093e78b 100644
--- a/modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb
@@ -47,7 +47,7 @@
return default if lookupvar('::settings::certname') =~ /\.wikimedia\.org$/
# Non-self-hosted puppetmasters all use the default ssldir
puppetmaster = lookupvar('puppetmaster')
- puppetmaster ||= function_hiera(['role::puppet::self::master', ''])
+ puppetmaster ||= call_function(:hiera, ['role::puppet::self::master', ''])
if puppetmaster == ''
# Means we aren't using any of role::puppet::self!1!
default
--
To view, visit https://gerrit.wikimedia.org/r/394367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ccf51035ea5fe2d538b7da967c1b19c4bcfcc04
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
