Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397588 )
Change subject: shinken: replace function_hiera with call_function(:hiera)
......................................................................
shinken: replace function_hiera with call_function(:hiera)
This is a puppet 4 requirement.
Change-Id: Ifd08fa3004f40ef3ecbcd5fd516429a135f694fe
---
M modules/shinken/templates/shinkengen.yaml.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/397588/1
diff --git a/modules/shinken/templates/shinkengen.yaml.erb
b/modules/shinken/templates/shinkengen.yaml.erb
index c26a1c2..308399b 100644
--- a/modules/shinken/templates/shinkengen.yaml.erb
+++ b/modules/shinken/templates/shinkengen.yaml.erb
@@ -1,6 +1,6 @@
projects: [ 'tools', 'deployment-prep', 'extdist', 'analytics', 'integration',
'shinken', 'cvn', 'wdq-mm', 'wmt' ]
output_path: '/etc/shinken/generated'
site: <%= scope.lookupvar("::site") %>
-keystone_host: <%= scope.function_hiera(['labs_keystone_host']) %>
-keystone_port: <%= scope.function_hiera(['keystone_public_port']) %>
-puppet_enc_host: <%= scope.function_hiera(['labs_puppet_master']) %>
+keystone_host: <%= scope.call_function(:hiera, ['labs_keystone_host']) %>
+keystone_port: <%= scope.call_function(:hiera, ['keystone_public_port']) %>
+puppet_enc_host: <%= scope.call_function(:hiera, ['labs_puppet_master']) %>
--
To view, visit https://gerrit.wikimedia.org/r/397588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd08fa3004f40ef3ecbcd5fd516429a135f694fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
